path: root/Next/merge.log

$ date -R
Mon, 07 Sep 2026 12:01:03 +0100
$ git checkout master
Already on 'master'
$ git reset --hard stable
Updating files:  36% (1389/3773)
Updating files:  37% (1397/3773)
Updating files:  38% (1434/3773)
Updating files:  39% (1472/3773)
Updating files:  40% (1510/3773)
Updating files:  41% (1547/3773)
Updating files:  42% (1585/3773)
Updating files:  43% (1623/3773)
Updating files:  44% (1661/3773)
Updating files:  45% (1698/3773)
Updating files:  46% (1736/3773)
Updating files:  47% (1774/3773)
Updating files:  48% (1812/3773)
Updating files:  49% (1849/3773)
Updating files:  50% (1887/3773)
Updating files:  51% (1925/3773)
Updating files:  52% (1962/3773)
Updating files:  53% (2000/3773)
Updating files:  54% (2038/3773)
Updating files:  55% (2076/3773)
Updating files:  56% (2113/3773)
Updating files:  57% (2151/3773)
Updating files:  58% (2189/3773)
Updating files:  59% (2227/3773)
Updating files:  60% (2264/3773)
Updating files:  61% (2302/3773)
Updating files:  62% (2340/3773)
Updating files:  63% (2377/3773)
Updating files:  64% (2415/3773)
Updating files:  64% (2421/3773)
Updating files:  65% (2453/3773)
Updating files:  66% (2491/3773)
Updating files:  67% (2528/3773)
Updating files:  68% (2566/3773)
Updating files:  69% (2604/3773)
Updating files:  70% (2642/3773)
Updating files:  71% (2679/3773)
Updating files:  72% (2717/3773)
Updating files:  73% (2755/3773)
Updating files:  74% (2793/3773)
Updating files:  75% (2830/3773)
Updating files:  76% (2868/3773)
Updating files:  77% (2906/3773)
Updating files:  78% (2943/3773)
Updating files:  79% (2981/3773)
Updating files:  80% (3019/3773)
Updating files:  81% (3057/3773)
Updating files:  82% (3094/3773)
Updating files:  83% (3132/3773)
Updating files:  83% (3142/3773)
Updating files:  84% (3170/3773)
Updating files:  85% (3208/3773)
Updating files:  86% (3245/3773)
Updating files:  87% (3283/3773)
Updating files:  88% (3321/3773)
Updating files:  89% (3358/3773)
Updating files:  90% (3396/3773)
Updating files:  91% (3434/3773)
Updating files:  92% (3472/3773)
Updating files:  93% (3509/3773)
Updating files:  94% (3547/3773)
Updating files:  95% (3585/3773)
Updating files:  96% (3623/3773)
Updating files:  97% (3660/3773)
Updating files:  98% (3698/3773)
Updating files:  99% (3736/3773)
Updating files: 100% (3773/3773)
Updating files: 100% (3773/3773), done.
HEAD is now at 421066905cbce Merge tag 'probes-fixes-v7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Merging origin/master (df2908090cda3 Linux 7.3-rc2)
$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
Updating 421066905cbce..df2908090cda3
Fast-forward (no commit created; -m option ignored)
 .mailmap                                           |   3 +-
 CREDITS                                            |   4 +
 Documentation/ABI/testing/ima_policy               |   3 +
 Documentation/ABI/testing/sysfs-class-firmware     |  14 +-
 .../fault-injection/nvme-fault-injection.rst       |  65 +++++
 .../translations/zh_CN/core-api/irq/irq-domain.rst |   4 -
 MAINTAINERS                                        |   7 +-
 Makefile                                           |   2 +-
 arch/arm64/crypto/aes-neonbs-glue.c                |   4 +-
 arch/arm64/include/asm/cpu.h                       |   1 +
 arch/arm64/include/asm/cpufeature.h                |   7 -
 arch/arm64/kernel/cpu_errata.c                     |   2 +-
 arch/arm64/kernel/cpufeature.c                     |  33 ++-
 arch/arm64/kernel/cpuinfo.c                        |   2 +-
 arch/arm64/kernel/machine_kexec.c                  |   3 +-
 arch/arm64/kvm/nested.c                            |   2 +-
 arch/arm64/mm/fault.c                              |  12 +-
 arch/loongarch/Kconfig                             |   2 +-
 arch/loongarch/include/asm/kvm_dmsintc.h           |   1 +
 arch/loongarch/include/asm/kvm_eiointc.h           |   1 +
 arch/loongarch/include/asm/kvm_host.h              |   2 +-
 arch/loongarch/include/asm/kvm_ipi.h               |   1 +
 arch/loongarch/include/asm/kvm_pch_pic.h           |   1 +
 arch/loongarch/kernel/kprobes.c                    |   3 +
 arch/loongarch/kernel/rethook_trampoline.S         |   2 -
 arch/loongarch/kernel/smp.c                        |   8 -
 arch/loongarch/kernel/vmlinux.lds.S                |   2 +-
 arch/loongarch/kvm/intc/dmsintc.c                  |   7 +-
 arch/loongarch/kvm/intc/eiointc.c                  |   5 +
 arch/loongarch/kvm/intc/ipi.c                      |   5 +
 arch/loongarch/kvm/intc/pch_pic.c                  |   8 +
 arch/loongarch/kvm/main.c                          |  39 ++-
 arch/loongarch/kvm/mmu.c                           |  16 +-
 arch/loongarch/kvm/vcpu.c                          |   6 +-
 arch/loongarch/kvm/vm.c                            |   1 +
 arch/loongarch/net/bpf_jit.c                       |   2 +-
 arch/mips/bcm47xx/buttons.c                        |   8 +-
 arch/powerpc/sysdev/xive/common.c                  |   2 +-
 arch/riscv/kvm/vcpu_pmu.c                          |   4 +-
 arch/riscv/net/bpf_jit_comp64.c                    |  10 +-
 arch/s390/kvm/s390/s390.c                          |   4 +-
 arch/x86/kernel/itmt.c                             |   8 +-
 arch/x86/net/bpf_jit_comp.c                        |   8 +-
 block/bio.c                                        |   9 +
 block/genhd.c                                      |   7 +
 drivers/accel/amdxdna/aie2_message.c               |   2 +-
 drivers/accel/amdxdna/amdxdna_ctx.c                |   4 +-
 drivers/accel/amdxdna/amdxdna_ctx.h                |   2 +-
 drivers/accel/amdxdna/amdxdna_gem.c                |  10 +-
 drivers/accel/ethosu/ethosu_drv.c                  |   2 +
 drivers/accel/ethosu/ethosu_gem.c                  |   2 +-
 drivers/accel/ethosu/ethosu_job.c                  |  10 +-
 drivers/accel/qaic/qaic_control.c                  |  46 ++--
 drivers/accel/rocket/rocket_job.c                  |   2 +-
 drivers/acpi/irq.c                                 |   8 +-
 drivers/ata/ahci.c                                 |  49 ++++
 drivers/ata/libata-scsi.c                          |  24 --
 drivers/base/property.c                            |   2 +-
 drivers/base/test/Kconfig                          |   1 -
 drivers/base/test/property-entry-test.c            |   3 +
 drivers/block/drbd/drbd_nl_gen.c                   |  40 +--
 drivers/block/loop.c                               |   8 +-
 drivers/block/ublk_drv.c                           |  10 +-
 drivers/block/zloop.c                              |   8 +-
 drivers/block/zram/backend_lz4.c                   |   2 +-
 drivers/char/virtio_console.c                      |   2 +-
 drivers/clk/ti/composite.c                         |   2 +-
 drivers/clk/ti/mux.c                               |   2 +-
 drivers/cpufreq/amd-pstate.c                       |   2 +-
 drivers/crypto/inside-secure/eip93/eip93-common.c  |   5 +-
 .../crypto/intel/qat/qat_common/qat_comp_algs.c    |   3 +-
 drivers/crypto/ti/dthev2-aes.c                     |   8 +-
 drivers/devfreq/hisi_uncore_freq.c                 |   2 +-
 drivers/dma-buf/dma-buf.c                          |  20 ++
 drivers/dma-buf/dma-heap.c                         |  80 +++---
 drivers/dma-buf/st-dma-fence.c                     |   2 +-
 drivers/dma-buf/udmabuf.c                          |   4 +-
 drivers/dma/switchtec_dma.c                        |   7 +-
 drivers/edac/versalnet_edac.c                      |   2 +-
 drivers/firmware/arm_scmi/driver.c                 |   2 +-
 drivers/firmware/qcom/qcom_tzmem.c                 |   8 +-
 drivers/firmware/ti_sci.c                          |   2 +-
 drivers/fpga/dfl-afu-dma-region.c                  |   2 +-
 drivers/gpio/gpio-aggregator.c                     |   4 +-
 drivers/gpio/gpio-mpsse.c                          |   2 +-
 drivers/gpio/gpio-sim.c                            |   3 +-
 drivers/gpio/gpio-virtuser.c                       |   3 +-
 drivers/gpio/gpiolib-cdev.c                        |   2 +-
 drivers/gpio/gpiolib.c                             |   4 +-
 drivers/gpu/buddy.c                                |  13 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c   |  11 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |   3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_lockdep.c        |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c            |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |   6 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c     |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |   5 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c            |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c          |   5 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c    |   6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c           |   6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |   4 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c             |   8 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c             |   8 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c              |   8 +-
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c           |  12 +-
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |  13 +-
 .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c |  12 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |   6 +-
 .../amd/display/amdgpu_dm/amdgpu_dm_backlight.c    |   8 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c    |  31 ++-
 .../amdgpu_dm/tests/amdgpu_dm_connector_test.c     |   2 +-
 .../display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c  |   8 +-
 .../display/amdgpu_dm/tests/amdgpu_dm_irq_test.c   |  18 +-
 .../display/amdgpu_dm/tests/amdgpu_dm_plane_test.c |   4 +-
 .../amd/display/amdgpu_dm/tests/amdgpu_dm_test.c   |   2 +-
 drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c   |   2 +-
 .../amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr.c   |   4 +-
 drivers/gpu/drm/amd/display/dc/core/dc.c           |   3 +-
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |   7 +-
 drivers/gpu/drm/amd/display/dc/core/dc_surface.c   |   2 +-
 .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c |   2 +-
 .../gpu/drm/amd/display/dc/dccg/dcn60/dcn60_dccg.c |   2 +-
 .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c |  34 +--
 .../dml2_core_dcn5_funcs_mode_programming.c        |   4 +-
 .../dml21/src/dml2_core/dml2_core_shared_types.h   |   4 +-
 .../src/dml2_pmo/dml2_pmo_dcn6_stage_optimizers.c  |   2 +-
 .../display/dc/dml2_0/dml2_translation_helper.c    |   1 +
 drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c       |   2 +-
 .../amd/display/dc/irq/dcn42/irq_service_dcn42.c   |   2 +-
 .../amd/display/dc/irq/dcn60/irq_service_dcn60.c   |   3 +-
 .../display/dc/link/protocols/link_dp_dpia_bw.c    |   5 +
 .../drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.c    |   2 +-
 .../amd/display/dc/resource/dcn30/dcn30_resource.c |   4 +-
 .../display/dc/resource/dcn302/dcn302_resource.c   |   4 +-
 .../display/dc/resource/dcn303/dcn303_resource.c   |   4 +-
 .../amd/display/dc/resource/dcn31/dcn31_resource.c |   4 +-
 .../display/dc/resource/dcn314/dcn314_resource.c   |   4 +-
 .../display/dc/resource/dcn315/dcn315_resource.c   |   4 +-
 .../display/dc/resource/dcn316/dcn316_resource.c   |   4 +-
 .../amd/display/dc/resource/dcn32/dcn32_resource.c |   4 +-
 .../display/dc/resource/dcn321/dcn321_resource.c   |   4 +-
 .../amd/display/dc/resource/dcn35/dcn35_resource.c |   4 +-
 .../display/dc/resource/dcn351/dcn351_resource.c   |   4 +-
 .../amd/display/dc/resource/dcn36/dcn36_resource.c |   4 +-
 .../display/dc/resource/dcn401/dcn401_resource.c   |   4 +-
 .../amd/display/dc/resource/dcn42/dcn42_resource.c |  50 ++--
 .../display/dc/resource/dcn42b/dcn42b_resource.c   |  46 ++--
 .../amd/display/dc/resource/dcn60/dcn60_resource.c |  42 ++--
 drivers/gpu/drm/amd/display/modules/power/power.c  |   5 +-
 .../gpu/drm/amd/display/modules/power/power_abm.c  |   3 +-
 .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c    |   2 +-
 .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c   |   4 +-
 drivers/gpu/drm/amd/ras/core/cmd.c                 |   4 +-
 drivers/gpu/drm/drm_atomic_state_helper.c          |   7 +
 drivers/gpu/drm/drm_atomic_uapi.c                  |   5 +-
 drivers/gpu/drm/drm_exec.c                         |   2 +-
 drivers/gpu/drm/drm_pagemap.c                      | 270 ++++++++++++++++++---
 drivers/gpu/drm/drm_prime.c                        |   2 +-
 drivers/gpu/drm/drm_syncobj.c                      |   2 +-
 drivers/gpu/drm/gud/gud_connector.c                |  12 +-
 drivers/gpu/drm/gud/gud_drv.c                      |   2 +
 drivers/gpu/drm/i915/display/intel_cdclk.c         |  10 +-
 drivers/gpu/drm/i915/display/intel_cursor.c        |  15 +-
 drivers/gpu/drm/i915/display/intel_cx0_phy.c       |   5 +-
 drivers/gpu/drm/i915/display/intel_ddi.c           |  11 +
 drivers/gpu/drm/i915/display/intel_ddi.h           |   1 +
 drivers/gpu/drm/i915/display/intel_dp_mst.c        |   4 -
 drivers/gpu/drm/i915/display/intel_lt_phy.c        |   6 +-
 drivers/gpu/drm/i915/display/skl_universal_plane.c |  15 +-
 drivers/gpu/drm/i915/i915_pci.c                    |   3 +
 drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h |   1 +
 drivers/gpu/drm/nouveau/nouveau_chan.c             |   9 +-
 drivers/gpu/drm/nouveau/nouveau_dmem.c             |  18 +-
 drivers/gpu/drm/nouveau/nouveau_sgdma.c            |   4 +-
 drivers/gpu/drm/nouveau/nouveau_uvmm.c             |   6 +-
 drivers/gpu/drm/nouveau/nvkm/engine/device/base.c  |  10 +-
 drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild    |   1 +
 drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c   |  13 +-
 drivers/gpu/drm/nouveau/nvkm/engine/disp/gb202.c   | 191 +++++++++++++++
 drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h    |   2 +
 drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h     |   1 +
 drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h    |  17 ++
 drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c   |  86 ++++++-
 .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c | 125 ++++------
 .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/disp.c |  64 +++++
 .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c  |   9 +
 .../nouveau/nvkm/subdev/gsp/rm/r570/nvrm/disp.h    |   2 +
 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h    |   5 +
 drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c |   3 +
 drivers/gpu/drm/qxl/qxl_display.c                  |   2 +-
 drivers/gpu/drm/sysfb/ofdrm.c                      |   8 +-
 drivers/gpu/drm/tegra/dc.c                         |   6 +
 drivers/gpu/drm/tegra/hub.c                        |   2 +
 drivers/gpu/drm/tilcdc/tilcdc_panel_legacy.c       |   2 +-
 drivers/gpu/drm/tiny/cirrus-qemu.c                 |   3 +
 drivers/gpu/drm/verisilicon/vs_plane.c             |   4 +-
 drivers/gpu/drm/virtio/virtgpu_display.c           |   9 +-
 drivers/gpu/drm/virtio/virtgpu_drv.h               |  21 ++
 drivers/gpu/drm/virtio/virtgpu_kms.c               |   1 +
 drivers/gpu/drm/virtio/virtgpu_object.c            |   2 +-
 drivers/gpu/drm/virtio/virtgpu_prime.c             |   4 +-
 drivers/gpu/drm/virtio/virtgpu_vq.c                |  21 +-
 drivers/gpu/drm/vkms/vkms_configfs.c               |   8 +-
 drivers/gpu/drm/xe/xe_amc.c                        |   2 +-
 drivers/gpu/drm/xe/xe_oa.c                         |   6 +-
 drivers/gpu/drm/xe/xe_vm.c                         |   2 +-
 drivers/gpu/drm/xe/xe_vram.c                       |   3 +
 drivers/hid/Kconfig                                |   2 +-
 drivers/hid/bpf/hid_bpf_struct_ops.c               |  23 +-
 drivers/hid/hid-asus.c                             |   6 +-
 drivers/hid/hid-hyperv.c                           |   4 +-
 drivers/hid/hid-ids.h                              |   1 +
 drivers/hid/hid-multitouch.c                       |  19 +-
 drivers/hid/hid-rmi.c                              |  46 +++-
 drivers/hid/hid-steam.c                            |   4 +-
 drivers/hid/hid-steelseries-arctis.c               |   2 +-
 drivers/hid/i2c-hid/i2c-hid-core.c                 |   2 +
 drivers/hid/wacom_wac.c                            |  13 +
 drivers/hv/channel.c                               |   5 +-
 drivers/hv/hv_balloon.c                            |   2 +-
 drivers/hwmon/applesmc.c                           |  17 +-
 drivers/hwtracing/coresight/coresight-core.c       |   2 +-
 drivers/i2c/busses/i2c-gpio.c                      |   2 +-
 drivers/i3c/master/amd-i3c-master.c                |   4 +-
 drivers/iio/adc/ad7280a.c                          |   4 +-
 drivers/iio/buffer/industrialio-buffer-dmaengine.c |   2 +-
 drivers/iio/inkern.c                               |   2 +-
 drivers/infiniband/core/nldev.c                    |   2 +-
 drivers/infiniband/hw/hns/hns_roce_debugfs.c       |   3 +-
 drivers/input/input.c                              |   2 +-
 drivers/input/keyboard/adp5585-keys.c              |   4 +-
 drivers/input/keyboard/atkbd.c                     |   2 +-
 drivers/input/misc/ims-pcu.c                       |   2 +-
 drivers/input/mouse/psmouse-smbus.c                |   2 +-
 drivers/input/serio/serio_raw.c                    |   2 +-
 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h        |   2 +-
 drivers/iommu/iommufd/device.c                     |   2 +-
 drivers/iommu/iommufd/driver.c                     |   2 +-
 drivers/iommu/iommufd/hwpt_noiommu.c               |   2 +-
 drivers/iommu/vsi-iommu.c                          |   2 +-
 drivers/irqchip/irq-gic-v5-irs.c                   |   2 +-
 drivers/irqchip/irq-loongarch-ir.c                 |   2 +-
 drivers/irqchip/irq-mbigen.c                       |  20 +-
 drivers/irqchip/irq-realtek-rtl.c                  |   2 +-
 drivers/irqchip/irq-stm32mp-exti.c                 |   4 +-
 drivers/mailbox/riscv-sbi-mpxy-mbox.c              |   2 +-
 drivers/md/dm-inlinecrypt.c                        |   2 +-
 drivers/md/md-llbitmap.c                           |   4 +-
 drivers/media/platform/allegro-dvt/allegro-core.c  |   2 +-
 drivers/media/platform/amd/isp4/isp4_interface.c   |   6 +-
 drivers/media/platform/renesas/rcar-isp/core.c     |   2 +-
 drivers/media/rc/igorplugusb.c                     |   2 +-
 drivers/mfd/mfd-core.c                             |   4 +-
 drivers/mfd/ucb1x00-assabet.c                      |   2 +-
 drivers/misc/fastrpc.c                             |  16 +-
 drivers/mtd/mtd_virt_concat.c                      |   4 +-
 drivers/mtd/mtdconcat.c                            |   2 +-
 drivers/net/dsa/mv88e6xxx/tcflower.c               |   2 +-
 drivers/net/ethernet/alibaba/eea/eea_adminq.c      |   7 +-
 drivers/net/ethernet/alibaba/eea/eea_net.c         |   8 +-
 drivers/net/ethernet/alibaba/eea/eea_pci.c         |   2 +-
 drivers/net/ethernet/alibaba/eea/eea_ring.c        |   2 +-
 drivers/net/ethernet/alibaba/eea/eea_rx.c          |   5 +-
 drivers/net/ethernet/alibaba/eea/eea_tx.c          |   3 +-
 drivers/net/ethernet/amd/pds_core/core.c           |   3 +-
 drivers/net/ethernet/amd/pds_core/fw.c             |   6 +-
 drivers/net/ethernet/cadence/macb_main.c           |   2 +-
 drivers/net/ethernet/cisco/enic/enic_admin.c       |   2 +-
 drivers/net/ethernet/cisco/enic/enic_main.c        |   6 +-
 .../net/ethernet/freescale/dpaa2/dpaa2-switch.c    |   5 +-
 drivers/net/ethernet/intel/libie/controlq.c        |   3 +-
 .../net/ethernet/marvell/octeontx2/af/cn20k/npc.c  |  13 +-
 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c  |   3 +-
 .../ethernet/mellanox/mlx5/core/eswitch_offloads.c |   2 +-
 .../net/ethernet/mellanox/mlx5/core/sf/hw_table.c  |   2 +-
 .../mellanox/mlx5/core/steering/sws/dr_icm_pool.c  |   2 +-
 drivers/net/ethernet/meta/fbnic/fbnic_irq.c        |   2 +-
 drivers/net/ethernet/microsoft/mana/gdma_main.c    |   8 +-
 drivers/net/ntb_netdev.c                           |   3 +-
 drivers/net/wireless/ath/ath12k/ahb.c              |   2 +-
 .../net/wireless/intel/iwlwifi/mld/regulatory.c    |   3 +-
 drivers/net/wireless/mediatek/mt76/mt7921/regd.c   |   2 +-
 drivers/net/wireless/mediatek/mt76/mt7925/main.c   |   2 +-
 drivers/net/wireless/mediatek/mt76/mt7925/regd.c   |   2 +-
 drivers/net/wireless/morsemicro/mm81x/mac.c        |   9 +-
 drivers/net/wireless/morsemicro/mm81x/yaps.c       |  10 +-
 drivers/net/wireless/nxp/nxpwifi/cfg80211.c        |  14 +-
 drivers/net/wireless/nxp/nxpwifi/cmdevt.c          |   2 +-
 drivers/net/wireless/nxp/nxpwifi/ie.c              |  14 +-
 drivers/net/wireless/nxp/nxpwifi/init.c            |   2 +-
 drivers/net/wireless/nxp/nxpwifi/main.c            |   8 +-
 drivers/net/wireless/nxp/nxpwifi/scan.c            |  13 +-
 drivers/net/wireless/nxp/nxpwifi/sta_cfg.c         |   2 +-
 drivers/net/wireless/nxp/nxpwifi/sta_cmd.c         |   2 +-
 drivers/net/wireless/nxp/nxpwifi/uap_event.c       |   2 +-
 drivers/nvdimm/region_devs.c                       |   3 +-
 drivers/nvme/host/core.c                           | 102 ++++----
 drivers/nvme/host/fabrics.c                        |   2 +
 drivers/nvme/host/fault_inject.c                   |  14 +-
 drivers/nvme/host/fc.c                             |  26 +-
 drivers/nvme/host/nvme.h                           |   2 +
 drivers/nvme/host/pci.c                            |   2 +-
 drivers/nvme/host/rdma.c                           |  18 +-
 drivers/nvme/host/sysfs.c                          |   2 +-
 drivers/nvme/host/tcp.c                            |  12 +
 drivers/nvme/host/zns.c                            |   4 +-
 drivers/nvme/target/auth.c                         |   6 +
 drivers/nvme/target/configfs.c                     |   4 +-
 drivers/nvme/target/core.c                         |   9 +-
 drivers/nvme/target/nvmet.h                        |   2 +
 drivers/nvme/target/pr.c                           |   2 +-
 drivers/nvme/target/rdma.c                         |  15 +-
 drivers/nvme/target/tcp.c                          |  10 +
 drivers/opp/core.c                                 |   4 +-
 drivers/pci/endpoint/pci-ep-msi.c                  |   4 +-
 drivers/platform/x86/amd/hsmp/acpi.c               |   5 +-
 .../platform/x86/hp/hp-bioscfg/enum-attributes.c   |   4 +-
 drivers/platform/x86/intel/pmc/pwrm_telemetry.c    |   3 +-
 drivers/pmdomain/core.c                            |   2 +-
 drivers/power/reset/reboot-mode.c                  |   6 +-
 drivers/power/sequencing/core.c                    |   2 +-
 drivers/power/sequencing/pwrseq-pcie-m2.c          |   2 +-
 drivers/power/supply/power_supply_core.c           |   6 +-
 drivers/ptp/ptp_chardev.c                          |   2 +-
 drivers/s390/block/dasd.c                          |   2 +-
 drivers/scsi/fnic/fnic_debugfs.c                   |   2 +-
 drivers/scsi/fnic/fnic_nvme.c                      |   2 +-
 drivers/scsi/ibmvscsi/ibmvfc-core.c                |   3 +-
 drivers/scsi/leapraid/leapraid_func.c              |  52 ++--
 drivers/scsi/megaraid/megaraid_sas_base.c          |  13 +-
 drivers/scsi/mpi3mr/mpi3mr_os.c                    |  45 +++-
 drivers/scsi/mpi3mr/mpi3mr_transport.c             |   8 +
 drivers/scsi/mpt3sas/mpt3sas_base.c                |   5 +-
 drivers/scsi/pm8001/pm8001_init.c                  |   4 +-
 drivers/scsi/scsi_bsg.c                            |  47 ++--
 drivers/scsi/scsi_scan.c                           |   2 +-
 drivers/soc/bcm/brcmstb/common.c                   |   2 +-
 drivers/spi/spi-offload.c                          |   2 +-
 drivers/staging/fbtft/fbtft-core.c                 |   9 +-
 drivers/staging/greybus/raw.c                      |   2 +-
 drivers/staging/media/atomisp/pci/sh_css.c         |  30 +--
 .../staging/media/atomisp/pci/sh_css_firmware.c    |   4 +-
 drivers/staging/rtl8723bs/core/rtw_ieee80211.c     |   7 +
 drivers/staging/rtl8723bs/core/rtw_mlme.c          |   3 +
 drivers/staging/sm750fb/sm750.c                    |   2 +-
 drivers/staging/sm750fb/sm750.h                    |   2 +-
 drivers/staging/sm750fb/sm750_accel.c              |   6 +-
 drivers/staging/sm750fb/sm750_accel.h              |   4 +-
 drivers/target/iscsi/iscsi_target.c                |   4 +-
 drivers/target/iscsi/iscsi_target_login.c          |   2 +-
 drivers/tee/qcomtee/user_obj.c                     |   3 +-
 drivers/thunderbolt/stream.c                       |  12 +-
 drivers/tty/moxa.c                                 |   3 +-
 drivers/tty/vt/consolemap.c                        |   3 +-
 drivers/ufs/core/ufs-txeq.c                        |   2 +-
 drivers/ufs/host/ufs-qcom.c                        |  19 +-
 drivers/ufs/host/ufs-qcom.h                        |   1 +
 drivers/ufs/host/ufshcd-pci.c                      |  59 +++++
 drivers/usb/cdns3/cdnsp-gadget.c                   | 111 ++++++++-
 drivers/usb/cdns3/cdnsp-gadget.h                   |   1 +
 drivers/usb/cdns3/cdnsp-mem.c                      |  98 +++-----
 drivers/usb/dwc3/dwc3-google.c                     |   1 +
 drivers/usb/dwc3/ep0.c                             |   2 +-
 drivers/usb/dwc3/gadget.c                          |  21 +-
 drivers/usb/gadget/function/f_mass_storage.c       |   5 +-
 drivers/usb/gadget/function/f_midi.c               |   2 +-
 drivers/usb/gadget/function/f_midi2.c              |  17 +-
 drivers/usb/gadget/function/f_ncm.c                |   2 +-
 drivers/usb/gadget/functions.c                     |   2 +-
 drivers/usb/gadget/legacy/inode.c                  |   3 +-
 drivers/usb/host/xhci-mem.c                        |   2 +-
 drivers/usb/host/xhci-ring.c                       |  43 +++-
 drivers/usb/image/mdc800.c                         |   4 +-
 drivers/usb/storage/ene_ub6250.c                   |   2 +
 drivers/usb/storage/realtek_cr.c                   |   9 +-
 drivers/usb/typec/hd3ss3220.c                      |   9 +-
 drivers/usb/typec/mux.c                            |  21 +-
 .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c    |   2 +
 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c |   5 +
 drivers/usb/typec/tcpm/tcpm.c                      |  28 ++-
 drivers/usb/typec/tipd/core.c                      |  17 +-
 drivers/usb/typec/tipd/tps6598x.h                  |   4 +-
 drivers/usb/typec/ucsi/displayport.c               |   2 +-
 drivers/usb/usbip/usbip_common.c                   |   2 +-
 drivers/xen/grant-table.c                          |   2 +-
 fs/9p/vfs_dentry.c                                 |   3 +-
 fs/afs/dir.c                                       |   2 +-
 fs/afs/symlink.c                                   |   3 +-
 fs/binfmt_misc.c                                   |   7 +-
 fs/btrfs/dev-replace.c                             |   2 +-
 fs/btrfs/inode.c                                   |   3 +
 fs/btrfs/ioctl.c                                   |  21 +-
 fs/btrfs/raid-stripe-tree.c                        |  25 +-
 fs/btrfs/raid-stripe-tree.h                        |   1 +
 fs/btrfs/scrub.c                                   |  24 +-
 fs/btrfs/send.c                                    |   9 +-
 fs/btrfs/tests/extent-io-tests.c                   |   5 +-
 fs/btrfs/transaction.c                             |  19 +-
 fs/btrfs/volumes.c                                 |   4 +
 fs/btrfs/zoned.c                                   |  16 +-
 fs/btrfs/zstd.c                                    |  11 +-
 fs/ceph/addr.c                                     |   2 +-
 fs/ceph/mds_client.c                               |   6 +-
 fs/ceph/mds_client.h                               |   1 +
 fs/ceph/subvolume_metrics.c                        |   2 +-
 fs/ceph/super.c                                    |   5 +
 fs/configfs/mount.c                                |   4 +-
 fs/coredump.c                                      |   2 +-
 fs/ext4/fast_commit.c                              |   4 +-
 fs/fuse/file.c                                     |   3 +-
 fs/fuse/readdir.c                                  |   2 +-
 fs/hfs/bnode.c                                     |   2 +-
 fs/kernfs/inode.c                                  |   4 +-
 fs/namespace.c                                     |   2 +-
 fs/nfsd/export.c                                   |   7 +-
 fs/nfsd/nfs4callback.c                             |   4 +-
 fs/nfsd/nfs4state.c                                |   7 +-
 fs/nfsd/nfsctl.c                                   |   2 +-
 fs/ntfs/bitmap.c                                   |   2 +-
 fs/ntfs/compress.c                                 |   8 +-
 fs/ntfs/dir.c                                      |  16 +-
 fs/ntfs/ea.c                                       |   2 +-
 fs/ntfs/index.c                                    |   2 +-
 fs/ntfs/logfile.c                                  |   2 +-
 fs/ntfs/mft.c                                      |  10 +-
 fs/ntfs/runlist.c                                  |  14 +-
 fs/ntfs/super.c                                    |   2 +-
 fs/overlayfs/readdir.c                             |   2 +-
 fs/smb/client/cifs_swn.c                           |   2 +-
 fs/smb/client/dfs_cache.c                          |   2 +-
 fs/smb/client/smb2inode.c                          |   2 +-
 fs/smb/server/ksmbd_work.c                         |   2 +-
 fs/smb/server/ksmbd_work.h                         |   2 +-
 fs/smb/server/mgmt/tree_connect.c                  |   8 +
 fs/smb/server/oplock.c                             |  73 ++++--
 fs/smb/server/smb2pdu.c                            |  30 ++-
 fs/smb/server/vfs.c                                |  12 +-
 fs/xfs/libxfs/xfs_da_btree.c                       |   4 +-
 include/drm/drm_pagemap.h                          |   8 +-
 include/linux/bpf.h                                |   3 +-
 include/linux/bpf_verifier.h                       |  16 +-
 include/linux/dma-buf.h                            |   1 +
 include/linux/dma-fence-array.h                    |   1 -
 include/linux/dma-fence-chain.h                    |   9 +-
 include/linux/filter.h                             |   1 -
 include/linux/ftrace.h                             |   5 +-
 include/linux/interrupt_rc.h                       |  22 +-
 include/linux/irqdomain.h                          |  18 --
 include/linux/nvme-tcp.h                           |  18 +-
 include/linux/preempt.h                            |   4 -
 include/linux/ring_buffer.h                        |   5 +-
 include/linux/sched/rt.h                           |   2 +
 include/uapi/drm/amdgpu_drm.h                      |   2 +-
 include/uapi/linux/magic.h                         |   1 +
 init/initramfs_test.c                              |   2 +-
 io_uring/napi.c                                    |   2 +-
 io_uring/zcrx.c                                    |   4 +-
 kernel/bpf/arraymap.c                              |   5 +-
 kernel/bpf/backtrack.c                             |  64 ++---
 kernel/bpf/bpf_iter.c                              |   2 +-
 kernel/bpf/btf.c                                   |  27 ++-
 kernel/bpf/cfg.c                                   |   3 +
 kernel/bpf/core.c                                  |   5 -
 kernel/bpf/diagnostics.c                           |   2 +-
 kernel/bpf/disasm.c                                |  50 ++--
 kernel/bpf/fixups.c                                |   7 +-
 kernel/bpf/hashtab.c                               |  31 +--
 kernel/bpf/liveness.c                              |   2 +-
 kernel/bpf/local_storage.c                         |   5 +-
 kernel/bpf/log.c                                   |   2 +-
 kernel/bpf/percpu_freelist.c                       |  35 ++-
 kernel/bpf/percpu_freelist.h                       |   1 +
 kernel/bpf/stackmap.c                              |   2 +
 kernel/bpf/states.c                                |  11 +-
 kernel/bpf/syscall.c                               |   2 +
 kernel/bpf/verifier.c                              | 264 +++++++++++++++-----
 kernel/dma/map_benchmark.c                         |   3 +-
 kernel/events/core.c                               |  25 +-
 kernel/events/ring_buffer.c                        |   9 +-
 kernel/futex/core.c                                |   6 +-
 kernel/futex/pi.c                                  |  16 +-
 kernel/futex/requeue.c                             |  12 +-
 kernel/irq/manage.c                                |   2 +-
 kernel/jump_label.c                                |   5 +-
 kernel/kthread.c                                   |   2 +-
 kernel/locking/lockdep.c                           |  50 +++-
 kernel/locking/rtmutex_api.c                       |   2 +
 kernel/sched/core.c                                |  26 +-
 kernel/sched/deadline.c                            |   4 +-
 kernel/sched/ext/cid.c                             |  16 +-
 kernel/sched/ext/ext.c                             |   2 +-
 kernel/sched/ext/sub.c                             |   2 +-
 kernel/sched/fair.c                                |  60 ++++-
 kernel/sched/rt.c                                  |   4 +-
 kernel/softirq.c                                   |  17 +-
 kernel/trace/fprobe.c                              |   2 +-
 kernel/trace/ftrace.c                              |  70 ++++--
 kernel/trace/ring_buffer.c                         | 243 ++++++++++++-------
 kernel/trace/ring_buffer_benchmark.c               |   6 +-
 kernel/trace/trace.c                               | 173 ++++++++-----
 kernel/trace/trace.h                               |  14 +-
 kernel/trace/trace_eprobe.c                        |   2 +-
 kernel/trace/trace_events.c                        |  28 ++-
 kernel/trace/trace_functions.c                     |   2 +-
 kernel/trace/trace_remote.c                        |  10 +-
 kernel/trace/trace_stack.c                         |   2 +-
 lib/test_rhashtable.c                              |   2 +-
 lib/test_workqueue.c                               |   4 +-
 lib/tests/kunit_iov_iter.c                         |   2 +-
 mm/damon/tests/vaddr-kunit.h                       |   2 +-
 net/batman-adv/hard-interface.c                    |   2 +-
 net/bluetooth/hci_sync.c                           |   3 +-
 net/ceph/messenger.c                               |   1 -
 net/devlink/netlink.c                              |   2 +-
 net/devlink/param.c                                |   7 +-
 net/ipv4/tcp_ipv4.c                                |   4 +-
 net/mac80211/nan.c                                 |   3 +-
 net/mctp/test/route-test.c                         |   2 +-
 net/mctp/test/utils.c                              |   2 +-
 net/netfilter/nf_tables_api.c                      |   2 +-
 net/netfilter/nfnetlink_cttimeout.c                |   2 +-
 net/rds/info.c                                     |   2 +-
 net/rxrpc/key.c                                    |   2 +-
 net/sched/act_gate.c                               |   4 +-
 net/sched/act_tunnel_key.c                         |   2 +-
 net/sunrpc/auth_gss/gss_krb5_crypto.c              |   5 +-
 net/sunrpc/svcauth_unix.c                          |   4 +-
 net/sunrpc/xdr.c                                   |   3 +-
 net/unix/af_unix.c                                 |   4 +-
 net/wireless/core.c                                |   5 +-
 net/wireless/nl80211.c                             |   9 +-
 rust/kernel/pci/irq.rs                             |   4 +-
 security/integrity/ima/Kconfig                     |   6 +-
 security/integrity/ima/ima_appraise.c              |   2 +
 security/integrity/ima/ima_policy.c                |   7 +-
 security/integrity/ima/ima_queue.c                 |   3 +-
 sound/core/compress_offload.c                      |   4 +-
 sound/core/control.c                               |   6 +-
 sound/core/control_led.c                           |   2 +-
 sound/core/init.c                                  |   2 +-
 sound/core/misc.c                                  |   2 +-
 sound/core/oss/mixer_oss.c                         |   2 +-
 sound/core/pcm_native.c                            |  39 ++-
 sound/core/rawmidi.c                               |   2 +-
 sound/core/seq/oss/seq_oss_synth.c                 |   2 +-
 sound/core/seq/seq_clientmgr.c                     |   2 +-
 sound/core/seq/seq_virmidi.c                       |   2 +-
 sound/core/timer.c                                 |   2 +-
 sound/core/ump.c                                   |   4 +
 sound/drivers/aloop.c                              |   4 +-
 sound/drivers/dummy.c                              |   2 +-
 sound/hda/codecs/cirrus/cs420x.c                   |   2 +
 sound/hda/codecs/conexant.c                        |  20 ++
 sound/hda/codecs/realtek/alc269.c                  |  39 ++-
 sound/hda/core/device.c                            |   5 +-
 sound/isa/gus/gus_dma.c                            |   2 +-
 sound/parisc/harmony.c                             |   6 +-
 sound/pci/cs46xx/cs46xx_lib.c                      |   2 +-
 sound/pci/ctxfi/ctamixer.c                         |   4 +-
 sound/pci/ctxfi/ctdaio.c                           |   4 +-
 sound/pci/ctxfi/ctsrc.c                            |   4 +-
 sound/pci/ctxfi/cttimer.c                          |   2 +-
 sound/pci/emu10k1/emufx.c                          |   2 +-
 sound/soc/codecs/simple-amplifier.c                |   2 +-
 sound/soc/generic/simple-card-utils.c              |   2 +-
 sound/soc/meson/gx-formatter.c                     |   2 +-
 sound/soc/qcom/qdsp6/q6afe.c                       |   2 +-
 sound/soc/sdca/sdca_functions.c                    |  19 +-
 sound/soc/sof/sof-client-probes-ipc4.c             |   2 +-
 sound/soc/sof/sof-client.c                         |   2 +-
 sound/sparc/amd7930.c                              |   2 +-
 sound/usb/caiaq/audio.c                            |  10 +-
 sound/usb/fcp.c                                    |   8 +
 sound/usb/midi.c                                   |   2 +
 sound/usb/mixer_maps.c                             |  18 ++
 sound/usb/mixer_quirks.c                           |   8 +
 sound/usb/mixer_s1810c.c                           |   8 +
 sound/usb/mixer_scarlett.c                         |   4 +
 sound/usb/mixer_scarlett2.c                        |  36 ++-
 sound/usb/mixer_us16x08.c                          |   7 +
 tools/perf/Makefile.config                         |   2 +
 tools/testing/selftests/alsa/mixer-test.c          |   4 +-
 .../selftests/bpf/prog_tests/btf_map_keyless.c     |  59 +++++
 tools/testing/selftests/bpf/prog_tests/rhash.c     |   6 +
 .../testing/selftests/bpf/prog_tests/rhash_timer.c | 141 +++++++++++
 .../selftests/bpf/prog_tests/snprintf_btf.c        |  79 ++++++
 tools/testing/selftests/bpf/prog_tests/timer_mim.c |  29 ++-
 tools/testing/selftests/bpf/progs/iters.c          |  39 +++
 tools/testing/selftests/bpf/progs/map_kptr_fail.c  |  37 +++
 .../selftests/bpf/progs/percpu_alloc_fail.c        |  59 +++++
 tools/testing/selftests/bpf/progs/preempt_lock.c   |  52 ++++
 .../testing/selftests/bpf/progs/raw_tp_null_fail.c |  53 ++++
 tools/testing/selftests/bpf/progs/rbtree_fail.c    |  84 +++++++
 tools/testing/selftests/bpf/progs/rcu_read_lock.c  |   6 +-
 .../testing/selftests/bpf/progs/refcounted_kptr.c  |  61 +++++
 .../selftests/bpf/progs/refcounted_kptr_fail.c     | 150 ++++++++++++
 tools/testing/selftests/bpf/progs/rhash.c          | 112 +++++++++
 tools/testing/selftests/bpf/progs/rhash_timer.c    |  98 ++++++++
 .../selftests/bpf/progs/snprintf_btf_void.c        |  24 ++
 .../selftests/bpf/progs/tailcall_callback.c        |  16 ++
 .../selftests/bpf/progs/task_local_data.bpf.h      |   3 +
 tools/testing/selftests/bpf/progs/test_bpf_nf.c    |   8 +-
 .../testing/selftests/bpf/progs/timer_mim_reject.c |  84 ++++++-
 .../bpf/progs/verifier_async_cb_context.c          |  98 ++++++++
 .../testing/selftests/bpf/progs/verifier_bounds.c  |  41 ++++
 .../selftests/bpf/progs/verifier_bpf_fastcall.c    | 110 +++++++++
 tools/testing/selftests/bpf/progs/verifier_cfg.c   |  14 ++
 .../selftests/bpf/progs/verifier_cgroup_storage.c  |  29 +++
 .../selftests/bpf/progs/verifier_global_ptr_args.c |  24 ++
 .../bpf/progs/verifier_iterating_callbacks.c       |  17 ++
 .../bpf/progs/verifier_jeq_infer_not_null.c        | 193 +++++++++++++++
 .../testing/selftests/bpf/progs/verifier_ld_ind.c  |  96 ++++++++
 .../selftests/bpf/progs/verifier_netfilter_ctx.c   |  78 ++++++
 .../selftests/bpf/progs/verifier_precision.c       | 100 ++++++++
 .../selftests/bpf/progs/verifier_scalar_ids.c      |  13 +-
 .../selftests/bpf/progs/verifier_spill_fill.c      |  40 +++
 .../bpf/progs/verifier_subprog_precision.c         |  63 ++++-
 tools/testing/selftests/bpf/progs/verifier_zext.c  |  26 ++
 tools/testing/selftests/bpf/verifier/pseudo_func.c |  45 ++++
 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 113 ++++++++-
 tools/testing/selftests/hid/hid_bpf.c              |  51 +++-
 tools/testing/selftests/hid/progs/hid.c            |  26 ++
 .../testing/selftests/hid/progs/hid_bpf_helpers.h  |   3 +
 625 files changed, 6443 insertions(+), 2020 deletions(-)
 create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/gb202.c
 create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_map_keyless.c
 create mode 100644 tools/testing/selftests/bpf/prog_tests/rhash_timer.c
 create mode 100644 tools/testing/selftests/bpf/progs/rhash_timer.c
 create mode 100644 tools/testing/selftests/bpf/progs/snprintf_btf_void.c
 create mode 100644 tools/testing/selftests/bpf/verifier/pseudo_func.c
Merging ext4-fixes/fixes (981fcc5674e67 jbd2: fix deadlock in jbd2_journal_cancel_revoke())
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes
Already up to date.
Merging vfs-brauner-fixes/vfs.fixes (e14d4302cbd0d Merge patch series "afs: Miscellaneous fixes")
$ git merge -m Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes
Auto-merging include/linux/sched.h
Auto-merging init/main.c
Auto-merging kernel/signal.c
Merge made by the 'ort' strategy.
 fs/adfs/super.c                    |  24 +++---
 fs/afs/addr_list.c                 |   5 +-
 fs/afs/dir_edit.c                  |   9 +-
 fs/afs/dir_search.c                |  11 +--
 fs/afs/fs_probe.c                  |   1 +
 fs/afs/internal.h                  |   8 ++
 fs/afs/server.c                    |   1 -
 fs/cachefiles/xattr.c              |  16 ++--
 fs/ext4/inode.c                    |  11 ++-
 fs/netfs/buffered_read.c           | 164 +++++++++++++++++++++++++++----------
 fs/netfs/direct_write.c            |  31 ++++---
 fs/netfs/internal.h                |   3 +
 fs/netfs/misc.c                    |  19 +++++
 fs/netfs/objects.c                 |  32 +++++---
 fs/netfs/read_collect.c            | 128 ++++++++++++++++++++---------
 fs/netfs/read_pgpriv2.c            |  15 ++--
 fs/netfs/read_retry.c              |  13 ++-
 fs/netfs/read_single.c             |   2 +
 fs/netfs/rolling_buffer.c          |  79 +++++++++++-------
 fs/netfs/write_issue.c             |   2 +
 fs/overlayfs/super.c               |   2 +-
 fs/super.c                         |   9 +-
 fs/ufs/cylinder.c                  |  10 +++
 fs/ufs/dir.c                       |   2 +-
 fs/ufs/super.c                     |  17 ++--
 include/linux/netfs.h              |   5 +-
 include/linux/ns/ns_common_types.h |   6 +-
 include/linux/rolling_buffer.h     |   6 +-
 include/linux/sched.h              |   2 +-
 include/linux/sched/signal.h       |   5 +-
 include/trace/events/cachefiles.h  |  19 ++++-
 include/trace/events/netfs.h       |  30 ++++++-
 init/main.c                        |   2 +-
 kernel/reboot.c                    |  19 ++++-
 kernel/signal.c                    |  12 +++
 35 files changed, 506 insertions(+), 214 deletions(-)
Merging fscrypt-current/for-current (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current
Already up to date.
Merging fsverity-current/for-current (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current
Already up to date.
Merging btrfs-fixes/next-fixes (4d1d66ba287be Merge branch 'misc-7.3' into next-fixes)
$ git merge -m Merge branch 'next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes
Merge made by the 'ort' strategy.
Merging vfs-fixes/fixes (49c5d168a3a8f udf: fix nls leak on udf_fill_super() failure)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes
Auto-merging fs/udf/super.c
Merge made by the 'ort' strategy.
Merging erofs-fixes/fixes (96bf9831fbf42 erofs: delimit inode_share cache key components)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes
Merge made by the 'ort' strategy.
 Documentation/ABI/testing/sysfs-fs-erofs |  2 +-
 fs/erofs/decompressor.c                  | 55 +++++++-------------------------
 fs/erofs/decompressor_lzma.c             | 18 ++++++++---
 fs/erofs/internal.h                      |  6 +---
 fs/erofs/sysfs.c                         |  2 ++
 fs/erofs/xattr.c                         |  9 +++---
 fs/erofs/zdata.c                         | 18 ++---------
 7 files changed, 38 insertions(+), 72 deletions(-)
Merging nfsd-fixes/nfsd-fixes (f76017a7663c4 nfsd: fix handling of NFSEXP_PNFS in the netlink codepath)
$ git merge -m Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes
Auto-merging fs/nfsd/export.c
Merge made by the 'ort' strategy.
 fs/nfsd/export.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Merging v9fs-fixes/fixes/next (028ef9c96e961 Linux 7.0)
$ git merge -m Merge branch 'fixes/next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next
Already up to date.
Merging overlayfs-fixes/ovl-fixes (4549871118cf6 Linux 7.1-rc7)
$ git merge -m Merge branch 'ovl-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes
Already up to date.
Merging fscrypt/for-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next
Already up to date.
Merging btrfs/for-next (966bb86e7420c Merge branch 'for-next-next-v7.3-20260902' into for-next-20260902)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next
Merge made by the 'ort' strategy.
 fs/btrfs/Kconfig                |   1 +
 fs/btrfs/bio.c                  | 141 ++++++++++++++++++----------------------
 fs/btrfs/bio.h                  |   5 +-
 fs/btrfs/block-group.c          |  20 +++---
 fs/btrfs/btrfs_inode.h          |  12 ++--
 fs/btrfs/dev-replace.c          |  10 ++-
 fs/btrfs/disk-io.c              |  27 ++++++--
 fs/btrfs/extent-tree.c          |  10 +++
 fs/btrfs/extent_io.c            |  64 +++++++++++-------
 fs/btrfs/extent_map.c           |   8 +++
 fs/btrfs/file-item.c            |  19 ++----
 fs/btrfs/fs.h                   |   2 +-
 fs/btrfs/inode.c                | 114 +++++++++++---------------------
 fs/btrfs/ioctl.c                |   2 +-
 fs/btrfs/qgroup.c               | 126 ++++++++++++++++++++---------------
 fs/btrfs/qgroup.h               |  16 ++++-
 fs/btrfs/raid56.c               |  46 +++++++------
 fs/btrfs/sysfs.c                | 129 ++----------------------------------
 fs/btrfs/tree-checker.c         |  66 +++++++++++++++----
 fs/btrfs/verity.c               |  31 ++++-----
 fs/btrfs/volumes.c              |  39 ++++++++++-
 fs/btrfs/volumes.h              |   1 +
 fs/btrfs/zoned.c                |   5 ++
 include/uapi/linux/btrfs_tree.h |  21 +++---
 24 files changed, 460 insertions(+), 455 deletions(-)
Merging ceph/master (dc173b37415e8 ceph: apply nearfull_sync option on remount)
$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master
Already up to date.
Merging cifs/cifs-next (f578137ecedbd smb: client: fix file type corruption in cifs_reparse_point_to_fattr())
$ git merge -m Merge branch 'cifs-next' of https://git.manguebit.org/linux.git cifs/cifs-next
Auto-merging fs/smb/client/dfs_cache.c
Merge made by the 'ort' strategy.
 fs/smb/client/cifsacl.c   | 44 +++++++++++++++++++++++++++++++++-----------
 fs/smb/client/cifssmb.c   | 26 +++++++++++++++++++++-----
 fs/smb/client/dfs_cache.c | 18 +++++++++---------
 fs/smb/client/file.c      | 22 ++++++++++++++++------
 fs/smb/client/inode.c     | 17 +++++++++++------
 fs/smb/client/misc.c      | 24 ++++++++++++------------
 fs/smb/client/readdir.c   | 17 ++++++++++++++---
 fs/smb/client/reparse.c   | 30 ++++++++++++++++++++----------
 fs/smb/client/trace.h     |  1 +
 9 files changed, 137 insertions(+), 62 deletions(-)
Merging configfs/configfs-next (2251d0ed97c24 configfs: unhash the dentry before dropping the item in rmdir)
$ git merge -m Merge branch 'configfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/leitao/linux.git configfs/configfs-next
Merge made by the 'ort' strategy.
 fs/configfs/dir.c     |  9 +++++++++
 fs/configfs/symlink.c | 24 ++++++++++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)
Merging ecryptfs/next (f81cb44f9a4b8 ecryptfs: ecryptfs_kernel.h: clean up kernel-doc comments)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next
Already up to date.
Merging dlm/next (ed9b6a1296f10 dlm: wait for outstanding SRCU callbacks to complete in exit paths)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next
Merge made by the 'ort' strategy.
 fs/dlm/config.c       | 30 ++++++++++++++++++++++++++++--
 fs/dlm/dlm_internal.h |  5 +++++
 fs/dlm/lock.c         | 18 +++++++++++++-----
 fs/dlm/lock.h         |  4 ++--
 fs/dlm/lowcomms.c     |  1 +
 fs/dlm/midcomms.c     |  1 +
 fs/dlm/plock.c        | 14 +++++++++++++-
 fs/dlm/user.c         | 23 +++++++++++++++++++++++
 8 files changed, 86 insertions(+), 10 deletions(-)
Merging erofs/dev (a7d28aa0e9b2c erofs: simplify z_erofs_gbuf_growsize())
$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev
Already up to date.
Merging exfat/dev (e15312d1a0272 exfat: take bitmap_lock at the start of exfat_alloc_cluster())
$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev
Merge made by the 'ort' strategy.
 Documentation/filesystems/exfat.rst | 117 ++++++++++++++++++++++++++++++++++++
 Documentation/filesystems/index.rst |   1 +
 fs/exfat/dir.c                      |  49 ++++++++++++++-
 fs/exfat/fatent.c                   |  19 +++---
 fs/exfat/iomap.c                    |  28 ++++++++-
 fs/exfat/namei.c                    |   3 +-
 fs/exfat/super.c                    |  10 ++-
 7 files changed, 211 insertions(+), 16 deletions(-)
 create mode 100644 Documentation/filesystems/exfat.rst
Merging ext3/for_next (ea51f3f0d3a5d Pull fsnotify typo fix.)
$ git merge -m Merge branch 'for_next' of https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next
Merge made by the 'ort' strategy.
 fs/ext2/Makefile                   |  2 ++
 fs/ext2/balloc.c                   |  4 +++
 fs/ext2/ext2.h                     | 19 ++++++++------
 fs/ext2/inode.c                    |  7 +++++
 fs/ext2/super.c                    | 33 ++++++++++++++----------
 fs/notify/fanotify/fanotify_user.c |  2 +-
 fs/ocfs2/quota_local.c             |  4 +++
 fs/udf/inode.c                     | 52 ++++++++++++++++++++++++++++++++++----
 fs/udf/misc.c                      | 15 ++++++-----
 fs/udf/super.c                     |  5 +++-
 mm/shmem_quota.c                   |  5 ++++
 11 files changed, 112 insertions(+), 36 deletions(-)
Merging ext4/dev (9091c97be3408 ext4: fix estimate extent index blocks in ext4_ext_index_trans_blocks())
$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev
Already up to date.
Merging f2fs/dev (5ad9409a9533b f2fs: stop using PG_private)
$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev
Merge made by the 'ort' strategy.
 fs/f2fs/checkpoint.c | 14 +++-----------
 fs/f2fs/f2fs.h       |  8 ++++----
 2 files changed, 7 insertions(+), 15 deletions(-)
Merging fsverity/for-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next
Already up to date.
Merging fuse/for-next (10bd6b3296526 fuse: fall back to copy_splice_read() on FOPEN_DIRECT_IO)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next
Auto-merging fs/fuse/file.c
Merge made by the 'ort' strategy.
 fs/fuse/dax.c                                      |  1 +
 fs/fuse/file.c                                     |  7 ++++--
 fs/fuse/fuse_i.h                                   |  9 +++++++
 fs/fuse/inode.c                                    | 28 ++++++++++++++++++++++
 fs/fuse/ioctl.c                                    |  3 ---
 fs/fuse/req.c                                      |  7 +++---
 include/uapi/linux/fuse.h                          | 12 +++++++++-
 .../testing/selftests/filesystems/fuse/.gitignore  |  1 +
 tools/testing/selftests/filesystems/fuse/Makefile  |  2 +-
 9 files changed, 59 insertions(+), 11 deletions(-)
Merging gfs2/for-next (0fd04e3f55e05 gfs2: fix typos in comments)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next
Merge made by the 'ort' strategy.
 fs/gfs2/acl.c        |  11 +++--
 fs/gfs2/aops.c       |  17 +++----
 fs/gfs2/bmap.c       |  93 +++++++++++++++++++++----------------
 fs/gfs2/dentry.c     |   6 +--
 fs/gfs2/dir.c        |  61 +++++++++++++++---------
 fs/gfs2/export.c     |   7 +--
 fs/gfs2/file.c       |  72 +++++++++++++++-------------
 fs/gfs2/glock.c      |  60 ++++++++++++++++--------
 fs/gfs2/glops.c      |  13 ++++--
 fs/gfs2/incore.h     |   8 ++--
 fs/gfs2/inode.c      | 122 ++++++++++++++++++++++++++----------------------
 fs/gfs2/lock_dlm.c   |   4 +-
 fs/gfs2/log.c        |   3 +-
 fs/gfs2/lops.c       |  18 ++++---
 fs/gfs2/meta_io.c    |   7 +--
 fs/gfs2/ops_fstype.c |  26 +++++------
 fs/gfs2/quota.c      |  54 +++++++++++----------
 fs/gfs2/recovery.c   |  19 ++++----
 fs/gfs2/rgrp.c       | 129 +++++++++++++++++++++++++++------------------------
 fs/gfs2/super.c      |  98 +++++++++++++++++++++++---------------
 fs/gfs2/trace_gfs2.h |   6 +--
 fs/gfs2/util.c       |   8 ++--
 fs/gfs2/xattr.c      |  69 ++++++++++++++++-----------
 23 files changed, 520 insertions(+), 391 deletions(-)
Merging jfs/jfs-next (dad98c5b2a05e jfs: avoid -Wtautological-constant-out-of-range-compare warning again)
$ git merge -m Merge branch 'jfs-next' of https://github.com/kleikamp/linux-shaggy.git jfs/jfs-next
Already up to date.
Merging ksmbd/ksmbd-for-next (7a0c2f8ad60f6 ksmbd: doc: update feature status)
$ git merge -m Merge branch 'ksmbd-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/smb.git ksmbd/ksmbd-for-next
Auto-merging fs/smb/server/ksmbd_work.c
Auto-merging fs/smb/server/smb2pdu.c
CONFLICT (content): Merge conflict in fs/smb/server/smb2pdu.c
Recorded preimage for 'fs/smb/server/smb2pdu.c'
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
Recorded resolution for 'fs/smb/server/smb2pdu.c'.
[fs-next f28e1a8949cbc] Merge branch 'ksmbd-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/smb.git
$ git diff -M --stat --summary HEAD^..
 Documentation/filesystems/smb/ksmbd.rst |  14 +-
 fs/smb/server/Kconfig                   |   2 +
 fs/smb/server/Makefile                  |   1 +
 fs/smb/server/ksmbd_work.c              |   3 -
 fs/smb/server/ksmbd_work.h              |   5 +-
 fs/smb/server/smb2pdu.c                 | 384 ++++++++------------------------
 fs/smb/server/smbacl.c                  |   2 +
 fs/smb/server/tests/Kconfig             |  15 ++
 fs/smb/server/tests/Makefile            |   4 +
 fs/smb/server/tests/smbacl_kunit.c      | 301 +++++++++++++++++++++++++
 fs/smb/server/vfs.c                     |   2 +
 fs/smb/server/vfs_cache.c               |  48 ----
 fs/smb/server/vfs_cache.h               |   6 -
 13 files changed, 435 insertions(+), 352 deletions(-)
 create mode 100644 fs/smb/server/tests/Kconfig
 create mode 100644 fs/smb/server/tests/Makefile
 create mode 100644 fs/smb/server/tests/smbacl_kunit.c
$ git am -3 ../patches/0001-ntfs3-Fix-up-merge-with-Linus.patch
Applying: ntfs3: Fix up merge with Linus
Using index info to reconstruct a base tree...
M	fs/ntfs3/file.c
Falling back to patching base and 3-way merge...
Auto-merging fs/ntfs3/file.c
No changes -- Patch already applied.
Merging nfs/linux-next (cee9395acd804 Linux 7.3-rc1)
$ 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 (e053b624f5d36 NFSv4.2: fix nfs4_listxattr size accounting)
$ 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 (b0b082cdd1354 nfsd: back CB_NOTIFY notify_mask words with per-delegation storage)
$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next
Auto-merging fs/nfsd/export.c
Merge made by the 'ort' strategy.
 MAINTAINERS                 |   3 +-
 fs/lockd/svc.c              |   1 -
 fs/lockd/trace.h            |   1 -
 fs/lockd/xdr.h              |   2 +-
 fs/namei.c                  |   2 +
 fs/nfs/nfs4file.c           |   1 +
 fs/nfs/super.c              |  25 ---
 fs/nfs_common/nfs_ssc.c     | 126 ++++++++-----
 fs/nfsd/blocklayout.c       |   1 +
 fs/nfsd/blocklayoutxdr.c    |  11 ++
 fs/nfsd/export.c            |   8 +-
 fs/nfsd/export.h            |   3 +-
 fs/nfsd/filecache.c         |   1 +
 fs/nfsd/flexfilelayout.c    |  24 ++-
 fs/nfsd/flexfilelayoutxdr.c |   9 +-
 fs/nfsd/flexfilelayoutxdr.h |   8 +-
 fs/nfsd/localio.c           |  10 +-
 fs/nfsd/lockd.c             |   4 +-
 fs/nfsd/nfs2acl.c           |  47 ++++-
 fs/nfsd/nfs3acl.c           |   1 +
 fs/nfsd/nfs3proc.c          |  78 +++++++-
 fs/nfsd/nfs3xdr.c           |   3 +
 fs/nfsd/nfs4acl.c           |   1 +
 fs/nfsd/nfs4callback.c      |   8 +-
 fs/nfsd/nfs4ctl.h           |  83 +++++++++
 fs/nfsd/nfs4idmap.c         |   1 +
 fs/nfsd/nfs4layouts.c       |   1 +
 fs/nfsd/nfs4proc.c          | 435 +++++++++++++++++++++++++++-----------------
 fs/nfsd/nfs4recover.c       |   1 +
 fs/nfsd/nfs4state.c         | 264 ++++++++++++++++++++++-----
 fs/nfsd/nfs4xdr.c           | 132 +++++++++++---
 fs/nfsd/nfscache.c          |   1 +
 fs/nfsd/nfsctl.c            |   2 +
 fs/nfsd/nfsd.h              | 236 +-----------------------
 fs/nfsd/nfserr.h            | 158 ++++++++++++++++
 fs/nfsd/nfsfh.c             |  72 ++++----
 fs/nfsd/nfsfh.h             |  28 ++-
 fs/nfsd/nfsproc.c           |  20 +-
 fs/nfsd/nfssvc.c            |   8 +
 fs/nfsd/nfsxdr.c            |   1 +
 fs/nfsd/state.h             |  44 ++++-
 fs/nfsd/vfs.c               | 298 ++++++++++++++----------------
 fs/nfsd/vfs.h               |  39 +++-
 fs/nfsd/xdr3.h              |   2 +-
 fs/nfsd/xdr4.h              | 152 ++--------------
 fs/nfsd/xdr4cb.h            |  20 +-
 include/linux/nfs.h         |  55 +-----
 include/linux/nfs3.h        |   8 +
 include/linux/nfs4.h        |   6 +
 include/linux/nfs_fh.h      |  63 +++++++
 include/linux/nfs_ssc.h     |  69 ++-----
 include/linux/nfsd_ssc.h    |  38 ++++
 include/linux/nfslocalio.h  |  11 +-
 include/trace/misc/nfs.h    |   1 +
 net/sunrpc/svcsock.c        |  83 ++++++++-
 net/sunrpc/xprtsock.c       |  66 ++++---
 56 files changed, 1676 insertions(+), 1100 deletions(-)
 create mode 100644 fs/nfsd/nfs4ctl.h
 create mode 100644 fs/nfsd/nfserr.h
 create mode 100644 include/linux/nfs_fh.h
 create mode 100644 include/linux/nfsd_ssc.h
$ git am -3 ../patches/0001-Revert-smb-client-implement-fileattr_get-to-support-.patch
Applying: Revert "smb: client: implement fileattr_get to support FS_IOC_GETFLAGS"
Using index info to reconstruct a base tree...
M	fs/smb/client/cifsfs.c
M	fs/smb/client/cifsfs.h
M	fs/smb/client/inode.c
Falling back to patching base and 3-way merge...
Auto-merging fs/smb/client/inode.c
Auto-merging fs/smb/client/cifsfs.h
Auto-merging fs/smb/client/cifsfs.c
No changes -- Patch already applied.
Merging ntfs/ntfs-next (c287cc5e36bd2 ntfs: propagate the ntfs_attr_iget() error in update_reparse_data())
$ git merge -m Merge branch 'ntfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/ntfs.git ntfs/ntfs-next
Merge made by the 'ort' strategy.
 fs/ntfs/attrlist.c | 4 ++--
 fs/ntfs/collate.c  | 2 +-
 fs/ntfs/inode.c    | 5 +++--
 fs/ntfs/reparse.c  | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
Merging ntfs3/master (cee9395acd804 Linux 7.3-rc1)
$ 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 (d410cd5303ec5 orangefs: skip leading spaces before parsing client debug masks)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git orangefs/for-next
Already up to date.
Merging overlayfs/overlayfs-next (1f6ee9be92f8d ovl: make fsync after metadata copy-up opt-in mount option)
$ git merge -m Merge branch 'overlayfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next
Already up to date.
Merging ubifs/next (a5e0055eac837 UBI: support per-device wear-leveling threshold)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next
Already up to date.
Merging v9fs/9p-next (aa88278693cbf 9p: Add missing read barrier in virtio zero-copy path)
$ git merge -m Merge branch '9p-next' of https://github.com/martinetd/linux v9fs/9p-next
Already up to date.
Merging v9fs-ericvh/ericvh/for-next (028ef9c96e961 Linux 7.0)
$ git merge -m Merge branch 'ericvh/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next
Already up to date.
Merging xfs/for-next (0ca15a1a11513 xfs: remove an extra cast in xfs_file_compat_ioctl)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next
Merge made by the 'ort' strategy.
 fs/xfs/libxfs/xfs_btree_mem.c        |   2 +
 fs/xfs/libxfs/xfs_btree_staging.c    |   4 +-
 fs/xfs/libxfs/xfs_da_btree.c         |   1 +
 fs/xfs/libxfs/xfs_defer.c            |  18 +-
 fs/xfs/libxfs/xfs_exchmaps.c         |  10 +
 fs/xfs/libxfs/xfs_parent.c           |  12 +-
 fs/xfs/libxfs/xfs_rtrefcount_btree.c |   7 +-
 fs/xfs/libxfs/xfs_rtrmap_btree.c     |   6 +-
 fs/xfs/libxfs/xfs_trans_space.c      |  19 +-
 fs/xfs/scrub/alloc_repair.c          |  18 +-
 fs/xfs/scrub/dir_repair.c            |  27 ++-
 fs/xfs/scrub/dirtree.c               |  31 ++-
 fs/xfs/scrub/dirtree_repair.c        |   1 +
 fs/xfs/scrub/ialloc.c                |   4 +
 fs/xfs/scrub/metapath.c              |  87 +++++++-
 fs/xfs/scrub/quota_repair.c          |  14 +-
 fs/xfs/scrub/quotacheck.c            |   4 +-
 fs/xfs/scrub/reap.c                  |   6 +-
 fs/xfs/scrub/refcount.c              |   8 +-
 fs/xfs/scrub/rgsuper.c               |   6 +-
 fs/xfs/scrub/rtrefcount.c            |  82 ++++++--
 fs/xfs/scrub/rtsummary_repair.c      |   3 +-
 fs/xfs/scrub/scrub.c                 |   3 +-
 fs/xfs/scrub/stats.c                 |  28 ++-
 fs/xfs/scrub/stats.h                 |   4 +-
 fs/xfs/scrub/symlink_repair.c        |   2 +-
 fs/xfs/scrub/trace.h                 |  35 +++-
 fs/xfs/xfs_buf.c                     |   4 +-
 fs/xfs/xfs_exchmaps_item.c           |  19 +-
 fs/xfs/xfs_exchrange.c               |  12 +-
 fs/xfs/xfs_extent_busy.c             |   4 +-
 fs/xfs/xfs_healthmon.c               | 130 ++++++------
 fs/xfs/xfs_healthmon.h               |   5 +-
 fs/xfs/xfs_icache.c                  |   3 +-
 fs/xfs/xfs_ioctl.c                   | 381 +++++++++++++++++++++--------------
 fs/xfs/xfs_ioctl.h                   |   4 +-
 fs/xfs/xfs_ioctl32.c                 | 188 +++++++++--------
 fs/xfs/xfs_log.c                     |  33 +--
 fs/xfs/xfs_log_cil.c                 |   3 +-
 fs/xfs/xfs_log_priv.h                |   4 +-
 fs/xfs/xfs_mru_cache.c               |   2 +-
 fs/xfs/xfs_trace.h                   |   4 +-
 fs/xfs/xfs_trans_ail.c               |   4 +-
 fs/xfs/xfs_verify_media.c            |  24 ++-
 fs/xfs/xfs_zone_alloc.c              |   2 +
 fs/xfs/xfs_zone_space_resv.c         |   8 +-
 46 files changed, 866 insertions(+), 410 deletions(-)
Merging zonefs/for-next (3a8389d42bdf4 zonefs: handle integer overflow in zonefs_fname_to_fno)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next
Already up to date.
Merging vfs-brauner/vfs.all (21860bb220225 Merge branch 'vfs-7.4.signal' into vfs.all)
$ git merge -m Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all
Auto-merging fs/binfmt_misc.c
Auto-merging fs/coredump.c
Auto-merging fs/gfs2/inode.c
Auto-merging fs/gfs2/log.c
Auto-merging fs/gfs2/lops.c
Auto-merging fs/namei.c
Auto-merging fs/smb/client/transport.c
Merge made by the 'ort' strategy.
 Documentation/admin-guide/binfmt-misc.rst          |    3 +
 Documentation/filesystems/proc.rst                 |    4 +
 arch/powerpc/Kconfig                               |    1 -
 arch/powerpc/include/asm/elf.h                     |    6 -
 arch/powerpc/include/asm/spu.h                     |    3 -
 arch/powerpc/platforms/cell/Kconfig                |    1 -
 arch/powerpc/platforms/cell/spu_syscalls.c         |   20 -
 arch/powerpc/platforms/cell/spufs/Makefile         |    1 -
 arch/powerpc/platforms/cell/spufs/coredump.c       |  183 --
 arch/powerpc/platforms/cell/spufs/file.c           |  114 --
 arch/powerpc/platforms/cell/spufs/spufs.h          |   12 -
 arch/powerpc/platforms/cell/spufs/syscalls.c       |    4 -
 drivers/base/devtmpfs.c                            |  108 +-
 fs/9p/vfs_inode.c                                  |    3 +
 fs/9p/vfs_inode_dotl.c                             |    3 +
 fs/adfs/dir.c                                      |    2 +-
 fs/aio.c                                           |   11 +-
 fs/binfmt_elf.c                                    |   16 +-
 fs/binfmt_elf_fdpic.c                              |   12 +-
 fs/binfmt_misc.c                                   |   12 +-
 fs/bpf_fs_kfuncs.c                                 |    4 +-
 fs/buffer.c                                        |   37 +-
 fs/ceph/file.c                                     |    3 +
 fs/coredump.c                                      |  438 +++--
 fs/exfat/misc.c                                    |    2 +-
 fs/ext2/xattr.c                                    |    2 +-
 fs/ext4/ext4_jbd2.c                                |    2 +-
 fs/ext4/mmp.c                                      |    2 +-
 fs/fat/misc.c                                      |    2 +-
 fs/fs-writeback.c                                  |    2 +-
 fs/fuse/dir.c                                      |    3 +
 fs/gfs2/inode.c                                    |    3 +
 fs/gfs2/log.c                                      |    4 +-
 fs/gfs2/lops.c                                     |    4 +-
 fs/inode.c                                         |    2 +-
 fs/internal.h                                      |    1 +
 fs/iomap/buffered-io.c                             |    6 +-
 fs/jbd2/commit.c                                   |   22 +-
 fs/jbd2/journal.c                                  |   31 +-
 fs/jbd2/transaction.c                              |    2 +-
 fs/kernfs/dir.c                                    |   76 +-
 fs/kernfs/kernfs-internal.h                        |    9 +-
 fs/namei.c                                         |  227 ++-
 fs/nfs/dir.c                                       |    6 +
 fs/ocfs2/buffer_head_io.c                          |   12 +-
 fs/ocfs2/journal.c                                 |   25 +-
 fs/omfs/inode.c                                    |    4 +-
 fs/open.c                                          |   59 +-
 fs/smb/client/dir.c                                |    3 +
 fs/smb/client/transport.c                          |   13 +-
 fs/vboxsf/dir.c                                    |    3 +
 include/linux/binfmts.h                            |    3 +-
 include/linux/buffer_head.h                        |   36 +-
 include/linux/coredump.h                           |   37 +-
 include/linux/fcntl.h                              |    6 +
 include/linux/sched.h                              |    2 +-
 include/linux/sched/signal.h                       |   27 +-
 include/uapi/linux/coredump.h                      |  149 +-
 ipc/mqueue.c                                       |    7 +
 kernel/pid_namespace.c                             |    3 +-
 kernel/user_namespace.c                            |    3 -
 tools/include/uapi/linux/coredump.h                |  149 +-
 tools/testing/selftests/Makefile                   |    1 +
 tools/testing/selftests/coredump/Makefile          |    7 +-
 .../selftests/coredump/coredump_notify_signal.h    |   29 +
 .../coredump/coredump_notify_signal_helper.c       |   46 +
 .../coredump/coredump_notify_signal_test.c         |  245 +++
 .../coredump/coredump_socket_protocol_test.c       | 1983 +++++++++++++++-----
 tools/testing/selftests/coredump/coredump_test.h   |   32 +-
 .../selftests/coredump/coredump_test_helpers.c     | 1742 ++++++++++++++++-
 .../selftests/coredump/coredump_test_helpers.h     |   79 +
 tools/testing/selftests/exec/Makefile              |    4 +
 tools/testing/selftests/exec/binfmt_misc_delim.c   |  127 ++
 tools/testing/selftests/filesystems/.gitignore     |    2 +-
 tools/testing/selftests/filesystems/Makefile       |    2 +-
 .../selftests/filesystems/file_stressor/.gitignore |    2 +
 .../selftests/filesystems/file_stressor/Makefile   |    6 +
 .../{ => file_stressor}/file_stressor.c            |    0
 .../selftests/filesystems/file_stressor/settings   |    3 +
 .../selftests/filesystems/fscontext_ns/.gitignore  |    2 +
 tools/testing/selftests/filesystems/kernfs_test.c  |   16 +-
 .../selftests/filesystems/open_o_creat_o_dir.c     |  201 ++
 tools/testing/selftests/filesystems/wrappers.h     |   11 +
 83 files changed, 5169 insertions(+), 1321 deletions(-)
 delete mode 100644 arch/powerpc/platforms/cell/spufs/coredump.c
 create mode 100644 tools/testing/selftests/coredump/coredump_notify_signal.h
 create mode 100644 tools/testing/selftests/coredump/coredump_notify_signal_helper.c
 create mode 100644 tools/testing/selftests/coredump/coredump_notify_signal_test.c
 create mode 100644 tools/testing/selftests/coredump/coredump_test_helpers.h
 create mode 100644 tools/testing/selftests/exec/binfmt_misc_delim.c
 create mode 100644 tools/testing/selftests/filesystems/file_stressor/.gitignore
 create mode 100644 tools/testing/selftests/filesystems/file_stressor/Makefile
 rename tools/testing/selftests/filesystems/{ => file_stressor}/file_stressor.c (100%)
 create mode 100644 tools/testing/selftests/filesystems/file_stressor/settings
 create mode 100644 tools/testing/selftests/filesystems/fscontext_ns/.gitignore
 create mode 100644 tools/testing/selftests/filesystems/open_o_creat_o_dir.c
$ git am -3 ../patches/0001-ksmbd-Fix-removal-of-type-parameter-from-vfs_path_pa.patch
Applying: ksmbd: Fix removal of type parameter from vfs_path_parent_lookup()
Using index info to reconstruct a base tree...
M	fs/smb/server/vfs.c
Falling back to patching base and 3-way merge...
Auto-merging fs/smb/server/vfs.c
No changes -- Patch already applied.
Merging vfs/for-next (4dda01b67c866 Merge branches 'work.dcache', 'work.dcache-d_add' and 'work.configfs' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next
Merge made by the 'ort' strategy.
Merging mm-fixes/for-next-fixes (d0dbc4db607d3 Merge https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-hotfixes-unstable into for-next-fixes)
$ git merge -m Merge branch 'for-next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mm/linux.git mm-fixes/for-next-fixes
Updating df2908090cda3..d0dbc4db607d3
Fast-forward (no commit created; -m option ignored)
 .mailmap                                    |    6 +-
 arch/x86/include/asm/pgtable.h              |    2 +-
 fs/dax.c                                    |    9 +-
 fs/ocfs2/namei.c                            |    9 +-
 fs/ocfs2/xattr.c                            |   13 +-
 fs/ocfs2/xattr.h                            |    8 +-
 fs/super.c                                  |   18 +-
 kernel/module/main.c                        |    8 +-
 lib/alloc_tag.c                             | 1029 ---------------------------
 lib/test_xarray.c                           |   70 ++
 lib/xarray.c                                |    8 +-
 mm/damon/ops-common.c                       |    7 +-
 mm/filemap.c                                |    2 +-
 mm/folio.c                                  |    2 +
 mm/huge_memory.c                            |   86 ++-
 mm/hugetlb.c                                |   34 +-
 mm/memblock.c                               |   18 +-
 mm/memcontrol.c                             |    2 +-
 mm/mlock.c                                  |    2 +-
 mm/mremap.c                                 |    9 +-
 mm/page_alloc.c                             |   18 +-
 mm/rmap.c                                   |    6 +-
 mm/shmem.c                                  |    5 +
 mm/shrinker.c                               |    2 +
 mm/slab_common.c                            |   18 +-
 mm/slub.c                                   |   27 +-
 mm/swapfile.c                               |    2 +-
 mm/vma.c                                    |    6 +-
 mm/vmalloc.c                                |   79 +-
 tools/testing/selftests/Makefile            |    5 +-
 tools/testing/selftests/cgroup/test_zswap.c |   28 +-
 31 files changed, 362 insertions(+), 1176 deletions(-)
 delete mode 100644 lib/alloc_tag.c
Merging fs-current (693947ef9f04e Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux)
$ git merge -m Merge branch 'fs-current' of linux-next fs-current
Auto-merging fs/super.c
Merge made by the 'ort' strategy.
 Documentation/ABI/testing/sysfs-fs-erofs |   2 +-
 fs/adfs/super.c                          |  24 ++---
 fs/afs/addr_list.c                       |   5 +-
 fs/afs/dir_edit.c                        |   9 +-
 fs/afs/dir_search.c                      |  11 +--
 fs/afs/fs_probe.c                        |   1 +
 fs/afs/internal.h                        |   8 ++
 fs/afs/server.c                          |   1 -
 fs/cachefiles/xattr.c                    |  16 +--
 fs/erofs/decompressor.c                  |  55 +++--------
 fs/erofs/decompressor_lzma.c             |  18 +++-
 fs/erofs/internal.h                      |   6 +-
 fs/erofs/sysfs.c                         |   2 +
 fs/erofs/xattr.c                         |   9 +-
 fs/erofs/zdata.c                         |  18 +---
 fs/ext4/inode.c                          |  11 ++-
 fs/netfs/buffered_read.c                 | 164 +++++++++++++++++++++++--------
 fs/netfs/direct_write.c                  |  31 +++---
 fs/netfs/internal.h                      |   3 +
 fs/netfs/misc.c                          |  19 ++++
 fs/netfs/objects.c                       |  32 +++---
 fs/netfs/read_collect.c                  | 128 +++++++++++++++++-------
 fs/netfs/read_pgpriv2.c                  |  15 +--
 fs/netfs/read_retry.c                    |  13 ++-
 fs/netfs/read_single.c                   |   2 +
 fs/netfs/rolling_buffer.c                |  79 +++++++++------
 fs/netfs/write_issue.c                   |   2 +
 fs/nfsd/export.c                         |   3 +-
 fs/overlayfs/super.c                     |   2 +-
 fs/super.c                               |   9 +-
 fs/ufs/cylinder.c                        |  10 ++
 fs/ufs/dir.c                             |   2 +-
 fs/ufs/super.c                           |  17 ++--
 include/linux/netfs.h                    |   5 +-
 include/linux/ns/ns_common_types.h       |   6 +-
 include/linux/rolling_buffer.h           |   6 +-
 include/linux/sched.h                    |   2 +-
 include/linux/sched/signal.h             |   5 +-
 include/trace/events/cachefiles.h        |  19 +++-
 include/trace/events/netfs.h             |  30 +++++-
 init/main.c                              |   2 +-
 kernel/reboot.c                          |  19 +++-
 kernel/signal.c                          |  12 +++
 43 files changed, 546 insertions(+), 287 deletions(-)
Merging kbuild-current/kbuild-fixes-for-next (94f7bba7e7f19 kbuild: don't delete in-flight filechk temporaries in asm-headers)
$ git merge -m Merge branch 'kbuild-fixes-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild-current/kbuild-fixes-for-next
Merge made by the 'ort' strategy.
 scripts/Makefile.asm-headers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging clang-fixes/clang-fixes-for-next (175db11786bde Disable -Wattribute-alias for clang-23 and newer)
$ git merge -m Merge branch 'clang-fixes-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux.git clang-fixes/clang-fixes-for-next
Already up to date.
Merging arc-current/for-curr (1590cf0329716 Linux 7.2-rc4)
$ git merge -m Merge branch 'for-curr' of https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr
Already up to date.
Merging arm-current/fixes (1039bffd6ae9c ARM: 9485/1: mm: acquire mmap write lock around show_pte() for user faults)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes
Already up to date.
Merging arm64-fixes/for-next/fixes (5445d64199626 arm64: Don't read GMID_EL1 when MTE is disabled)
$ git merge -m Merge branch 'for-next/fixes' of https://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 (e36c0670d5ebe Merge tag 'tegra-for-7.2-arm64-dt-fixes-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/fixes)
$ git merge -m Merge branch 'arm/fixes' of https://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 (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'davinci/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current
Already up to date.
Merging realtek-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git realtek-fixes/fixes
Already up to date.
Merging drivers-memory-fixes/fixes (cee9395acd804 Linux 7.3-rc1)
$ 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 sophgo-fixes/fixes (19272b37aa4f8 Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes
Already up to date.
Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b428 Linux 6.15-rc1)
$ git merge -m Merge branch 'soc-fixes' of https://github.com/sophgo/linux.git sophgo-soc-fixes/soc-fixes
Already up to date.
Merging m68k-current/for-linus (2f8e3cad53b5c m68k: nfcon: Do not call console_is_registered() in nfcon_device())
$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus
Already up to date.
Merging powerpc-fixes/fixes (45a5f7285f835 MAINTAINERS: powerpc: Add Ritesh and Shrikanth)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 MAINTAINERS                               |  2 ++
 arch/powerpc/include/asm/entry-common.h   | 12 +++++++++---
 arch/powerpc/kernel/eeh_driver.c          |  2 --
 arch/powerpc/kernel/interrupt.c           |  2 +-
 arch/powerpc/kernel/rtas_pci.c            |  8 ++++++++
 arch/powerpc/kernel/syscall.c             |  4 +++-
 arch/powerpc/kexec/file_load_64.c         | 10 +++-------
 arch/powerpc/platforms/powernv/pci-ioda.c |  6 ++----
 arch/powerpc/platforms/ps3/repository.c   |  5 ++++-
 arch/powerpc/platforms/pseries/pci.c      | 13 ++++++++-----
 10 files changed, 40 insertions(+), 24 deletions(-)
Merging s390-fixes/fixes (98d23edcd4143 s390/zcrypt: Fix uninitialized padding in CRT key structure)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
Already up to date.
Merging net/main (38b6be101006d net: macb: fix NULL pointer dereference on unbind with fixed-link)
$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main
Auto-merging .mailmap
Auto-merging drivers/net/ethernet/amd/pds_core/fw.c
Auto-merging drivers/net/ethernet/cadence/macb_main.c
Auto-merging drivers/net/ethernet/cisco/enic/enic_main.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
Merge made by the 'ort' strategy.
 .mailmap                                           |   3 +
 Documentation/netlink/specs/rt-link.yaml           |   2 +
 drivers/dibs/dibs_main.c                           |  10 +-
 drivers/net/bonding/bond_alb.c                     |  19 +-
 drivers/net/dsa/bcm_sf2_cfp.c                      |   2 +
 drivers/net/dsa/mv88e6xxx/chip.c                   |  16 +-
 drivers/net/ethernet/amd/pds_core/fw.c             |  10 +-
 drivers/net/ethernet/amd/pds_core/main.c           |  10 +-
 drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c   |   4 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt.c          |  42 ++-
 drivers/net/ethernet/broadcom/bnxt/bnxt.h          |   1 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c      |  21 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_gso.h      |   6 +-
 drivers/net/ethernet/cadence/macb_main.c           |  12 +-
 drivers/net/ethernet/cisco/enic/enic.h             |  26 +-
 drivers/net/ethernet/cisco/enic/enic_main.c        |  25 +-
 drivers/net/ethernet/cisco/enic/enic_mbox.c        | 321 +++++++++++++--------
 drivers/net/ethernet/cisco/enic/enic_mbox.h        |   2 +
 drivers/net/ethernet/marvell/octeontx2/af/mcs.c    |  10 +
 drivers/net/ethernet/mellanox/mlx5/core/en/port.c  |  15 +-
 drivers/net/ethernet/mellanox/mlx5/core/en/port.h  |   4 +
 .../net/ethernet/mellanox/mlx5/core/en/tc/sample.c |   7 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c |   2 +-
 .../net/ethernet/mellanox/mlx5/core/en_ethtool.c   |  13 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_stats.c |  51 ++--
 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c  |   8 +-
 .../mellanox/mlx5/core/eswitch_offloads_termtbl.c  |   7 +-
 drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c  |  19 +-
 drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c |  34 ++-
 drivers/net/ethernet/microsoft/mana/mana_en.c      |   6 +-
 .../net/ethernet/netronome/nfp/nfp_net_ethtool.c   |  19 +-
 drivers/net/ethernet/pensando/ionic/ionic_txrx.c   |  13 +-
 drivers/net/ieee802154/cc2520.c                    |   5 +-
 drivers/net/ieee802154/mac802154_hwsim.c           |  10 +-
 drivers/net/mctp/mctp-i3c.c                        |   9 +-
 drivers/net/usb/cx82310_eth.c                      |   1 +
 drivers/net/vxlan/vxlan_core.c                     |  11 +
 drivers/s390/net/ism_drv.c                         |   4 +-
 include/linux/ethtool.h                            |   6 +
 include/net/cfg802154.h                            |   1 +
 include/net/sch_generic.h                          |   2 +-
 net/6lowpan/nhc.h                                  |   3 +-
 net/bridge/br_multicast.c                          |   9 +-
 net/core/dev.c                                     |   2 +-
 net/core/rtnetlink.c                               |   7 +-
 net/core/skbuff.c                                  |   7 +
 net/ieee802154/6lowpan/core.c                      |   2 +-
 net/ipv4/fib_rules.c                               |   4 +-
 net/ipv4/ip_tunnel_core.c                          |   6 +
 net/ipv4/nexthop.c                                 |   2 +-
 net/mac802154/ieee802154_i.h                       |   8 +
 net/mac802154/iface.c                              |   6 +
 net/mac802154/main.c                               |   1 +
 net/mac802154/rx.c                                 | 120 ++++++--
 net/mac802154/scan.c                               |  10 +-
 net/netlink/genetlink.c                            |  21 +-
 net/sched/sch_api.c                                |   2 +-
 net/sched/sch_drr.c                                |   3 +-
 net/sched/sch_dualpi2.c                            |  10 +-
 net/sched/sch_ets.c                                |  12 +-
 net/sched/sch_fq.c                                 |  14 +-
 net/sched/sch_fq_pie.c                             |   3 +-
 net/sched/sch_generic.c                            |  24 +-
 net/sched/sch_hhf.c                                |   8 +-
 net/sched/sch_pie.c                                |   2 +-
 net/sched/sch_sfq.c                                |   7 +-
 tools/testing/selftests/net/fib_nexthops.sh        |  28 ++
 tools/testing/selftests/net/pmtu.sh                |   2 +-
 .../selftests/tc-testing/tc-tests/qdiscs/ets.json  |   4 +-
 .../tc-testing/tc-tests/qdiscs/pfifo_fast.json     | 204 +++++++++++++
 70 files changed, 975 insertions(+), 345 deletions(-)
Merging bpf/master (df2908090cda3 Linux 7.3-rc2)
$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/ bpf/master
Already up to date.
Merging ipsec/master (96f01b53c2d05 net: xfrm: reject unrepresentable espintcp transport headers)
$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
Auto-merging net/ipv4/esp4.c
Auto-merging net/ipv6/esp6.c
Merge made by the 'ort' strategy.
 net/ipv4/esp4.c         |  6 ++++++
 net/ipv6/esp6.c         |  6 ++++++
 net/ipv6/xfrm6_output.c | 10 ++++++++--
 net/xfrm/espintcp.c     |  6 +++++-
 net/xfrm/xfrm_input.c   | 22 +++++++++++++++++++---
 net/xfrm/xfrm_iptfs.c   | 12 ++++++++++--
 net/xfrm/xfrm_policy.c  | 20 +++++++++++++++-----
 net/xfrm/xfrm_state.c   |  9 +++++++--
 net/xfrm/xfrm_user.c    | 18 +++++-------------
 9 files changed, 81 insertions(+), 28 deletions(-)
Merging netfilter/main (1b78070aaef63 Merge tag 'net-7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main
Already up to date.
Merging ipvs/main (1b78070aaef63 Merge tag 'net-7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main
Already up to date.
Merging wireless/for-next (da2ca406f45a6 wifi: mac80211: avoid WARN in set_bitrate_mask when sdata not in driver)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next
Merge made by the 'ort' strategy.
 .../broadcom/brcm80211/brcmfmac/cyw/core.c         |  5 +-
 drivers/net/wireless/intel/ipw2x00/ipw2100.c       |  4 +-
 drivers/net/wireless/intel/ipw2x00/ipw2200.c       |  9 ++++
 drivers/net/wireless/intel/ipw2x00/libipw_rx.c     |  6 +++
 drivers/net/wireless/intel/iwlegacy/common.c       |  2 +-
 drivers/net/wireless/intersil/p54/eeprom.c         | 22 +++++++--
 drivers/net/wireless/marvell/libertas_tf/main.c    |  2 +-
 drivers/net/wireless/marvell/mwifiex/cfg80211.c    | 12 ++++-
 drivers/net/wireless/marvell/mwifiex/pcie.c        |  2 +-
 drivers/net/wireless/marvell/mwifiex/scan.c        | 54 ++++++++++++++++------
 drivers/net/wireless/marvell/mwifiex/util.c        | 10 +++-
 drivers/net/wireless/microchip/wilc1000/cfg80211.c | 14 ++++++
 drivers/net/wireless/ti/wlcore/main.c              |  4 +-
 drivers/net/wireless/virtual/virt_wifi.c           |  1 +
 include/linux/ieee80211-mesh.h                     |  4 +-
 net/mac80211/cfg.c                                 |  3 ++
 net/mac80211/tx.c                                  | 41 ++++++++--------
 17 files changed, 144 insertions(+), 51 deletions(-)
Merging ath/for-current (1b78070aaef63 Merge tag 'net-7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current
Already up to date.
Merging iwlwifi/fixes (d13d5d299c11b wifi: iwlwifi: validate SEC_RT TLV minimum size)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi/fixes
Already up to date.
Merging wpan/master (2b4707a149a55 net: mctp: i3c: serialize probe with bus removal)
$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master
Already up to date.
Merging rdma-fixes/for-rc (2ae16aaa78b5e RDMA/rtrs-clt: Fix CQ pool leak when connect is interrupted)
$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc
Merge made by the 'ort' strategy.
 drivers/infiniband/core/mad.c                |  3 +-
 drivers/infiniband/core/rdma_core.c          |  1 -
 drivers/infiniband/core/uverbs_flow.c        |  1 +
 drivers/infiniband/core/uverbs_main.c        | 25 ++++++--------
 drivers/infiniband/core/verbs.c              | 12 ++++---
 drivers/infiniband/hw/bnxt_re/main.c         | 10 ++++--
 drivers/infiniband/hw/bnxt_re/uapi.c         |  6 ++--
 drivers/infiniband/hw/erdma/erdma_main.c     |  4 +--
 drivers/infiniband/hw/erdma/erdma_verbs.c    | 18 +++++-----
 drivers/infiniband/hw/hfi1/file_ops.c        | 23 +++++++++----
 drivers/infiniband/hw/irdma/verbs.c          |  2 +-
 drivers/infiniband/hw/mlx4/sysfs.c           |  4 +++
 drivers/infiniband/hw/mlx5/main.c            |  7 ++--
 drivers/infiniband/sw/rxe/rxe_mcast.c        | 50 ++++++++++++++++++++--------
 drivers/infiniband/sw/rxe/rxe_mr.c           |  3 +-
 drivers/infiniband/sw/rxe/rxe_odp.c          | 16 ++++++---
 drivers/infiniband/sw/rxe/rxe_verbs.c        | 13 ++++----
 drivers/infiniband/sw/siw/siw_cm.c           |  7 ++--
 drivers/infiniband/ulp/iser/iser_initiator.c | 16 ++++++---
 drivers/infiniband/ulp/isert/ib_isert.c      | 22 ++++++++++++
 drivers/infiniband/ulp/isert/ib_isert.h      |  2 ++
 drivers/infiniband/ulp/rtrs/rtrs-clt-trace.h |  2 +-
 drivers/infiniband/ulp/rtrs/rtrs-clt.c       |  8 +++++
 drivers/infiniband/ulp/rtrs/rtrs-clt.h       |  2 ++
 drivers/infiniband/ulp/rtrs/rtrs-srv-trace.h |  2 +-
 drivers/infiniband/ulp/srp/ib_srp.c          | 14 +++++---
 include/rdma/uverbs_types.h                  |  2 --
 include/uapi/rdma/bnxt_re-abi.h              |  2 +-
 28 files changed, 186 insertions(+), 91 deletions(-)
Merging sound-current/for-linus (b731337680929 ALSA: usb-audio: Add quirk flags for Behringer UV1)
$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
Merge made by the 'ort' strategy.
 sound/hda/codecs/realtek/alc269.c |   1 +
 sound/pci/ctxfi/cthw20k2.c        |   1 +
 sound/usb/6fire/comm.c            |  42 ++++++++-----
 sound/usb/6fire/comm.h            |   2 +-
 sound/usb/6fire/midi.c            |  43 +++++++++----
 sound/usb/6fire/midi.h            |   2 +-
 sound/usb/6fire/pcm.c             | 128 ++++++++++++++++++++++----------------
 sound/usb/6fire/pcm.h             |   5 +-
 sound/usb/caiaq/device.c          |  36 +++++++----
 sound/usb/caiaq/device.h          |   4 +-
 sound/usb/caiaq/midi.c            |   6 +-
 sound/usb/hiface/pcm.c            |  44 ++++++-------
 sound/usb/misc/ua101.c            | 102 ++++++++++++++++--------------
 sound/usb/quirks.c                |  25 ++++++++
 sound/usb/usx2y/usbusx2y.c        |  10 ++-
 sound/usb/usx2y/usbusx2y.h        |   4 +-
 16 files changed, 279 insertions(+), 176 deletions(-)
Merging sound-asoc-fixes/for-linus (c1e01ea350937 ASoC: codecs: ES8389: Prevent enable_count underflow in clk_core_disable)
$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus
Merge made by the 'ort' strategy.
 sound/hda/core/ext/controller.c                   |   4 +-
 sound/hda/core/ext/stream.c                       |   5 +-
 sound/soc/amd/renoir/acp3x-pdm-dma.c              |   2 +-
 sound/soc/amd/yc/acp6x-mach.c                     |   7 +
 sound/soc/amd/yc/acp6x-pdm-dma.c                  |   2 +
 sound/soc/codecs/ab8500-codec.c                   | 688 +++++++++-------------
 sound/soc/codecs/cs35l56-sdw.c                    |   7 +-
 sound/soc/codecs/cs35l56.c                        |  71 ++-
 sound/soc/codecs/cs35l56.h                        |   2 +
 sound/soc/codecs/es8326.c                         |  19 +-
 sound/soc/codecs/es8389.c                         |  34 +-
 sound/soc/codecs/rt1318-sdw.c                     |  24 +-
 sound/soc/codecs/rt1320-sdw.c                     |   2 +-
 sound/soc/codecs/rt712-sdca.c                     |  17 +-
 sound/soc/codecs/rt721-sdca.c                     |  17 +-
 sound/soc/codecs/rt722-sdca.c                     |  16 +-
 sound/soc/codecs/rt766-sdca.c                     |   5 +-
 sound/soc/codecs/tas2783-sdw.c                    |  25 +
 sound/soc/fsl/fsl_micfil.c                        |  21 +-
 sound/soc/intel/avs/boards/hdaudio.c              |  17 +
 sound/soc/intel/avs/core.c                        |  59 +-
 sound/soc/intel/avs/debugfs.c                     |  12 +-
 sound/soc/intel/avs/ipc.c                         |   6 +-
 sound/soc/intel/avs/path.c                        |  11 +-
 sound/soc/intel/avs/pcm.c                         |  34 +-
 sound/soc/intel/avs/topology.c                    |  49 +-
 sound/soc/intel/avs/topology.h                    |   5 +-
 sound/soc/intel/boards/Kconfig                    |   4 +-
 sound/soc/intel/boards/sof_rt5682.c               |   8 +
 sound/soc/intel/common/soc-acpi-intel-nvl-match.c |   8 +-
 sound/soc/sprd/sprd-pcm-compress.c                |  15 +-
 sound/soc/sti/uniperif_reader.c                   |   4 +-
 sound/soc/ux500/ux500_msp_dai.c                   | 189 +++---
 sound/soc/ux500/ux500_msp_dai.h                   |  14 +-
 sound/soc/ux500/ux500_msp_i2s.c                   | 260 +++++---
 sound/soc/ux500/ux500_msp_i2s.h                   |  12 +-
 36 files changed, 878 insertions(+), 797 deletions(-)
Merging regmap-fixes/for-linus (2e42cade8ff1f regmap: irq: Free the irqdomain we create)
$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus
Merge made by the 'ort' strategy.
 drivers/base/regmap/regmap-irq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging regulator-fixes/for-linus (ca12149896ed0 regulator: dt-bindings: fan53555: add tcs,tcs4526)
$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus
Merge made by the 'ort' strategy.
 Documentation/devicetree/bindings/regulator/fcs,fan53555.yaml | 1 +
 1 file changed, 1 insertion(+)
Merging spi-fixes/for-linus (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus
Already up to date.
Merging pci-current/for-linus (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-linus' of https://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 (f6d752278c138 MAINTAINERS: Remove Russ Weight from Firmware Loader)
$ git merge -m Merge branch 'driver-core-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core.current/driver-core-linus
Already up to date.
Merging tty.current/tty-linus (b144dc5a24149 virtio_console: allocate the port_buffer with the caller's gfp)
$ git merge -m Merge branch 'tty-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus
Already up to date.
Merging usb.current/usb-linus (c9273c8388583 usb: typec: qcom-pmic-typec: drain cc_debounce_dwork if port_start() fails)
$ git merge -m Merge branch 'usb-linus' of https://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 (6177bcd94be83 USB: serial: option: add Quectel RG660QB)
$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus
Merge made by the 'ort' strategy.
 drivers/usb/serial/option.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
Merging phy/fixes (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes
Already up to date.
Merging staging.current/staging-linus (cc7cd2a922817 staging: sm750fb: fix mono image source stride mismatch in lynxfb_ops_imageblit())
$ git merge -m Merge branch 'staging-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus
Already up to date.
Merging iio-fixes/fixes-togreg (e24328974a88a iio: proximity: vl53l0x-i2c: claim direct mode for raw reads)
$ git merge -m Merge branch 'fixes-togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg
Auto-merging drivers/iio/buffer/industrialio-buffer-dmaengine.c
Merge made by the 'ort' strategy.
 .../bindings/iio/adc/rockchip-saradc.yaml          | 18 +++----
 drivers/iio/accel/kionix-kx022a.c                  | 30 ++++++++---
 drivers/iio/accel/sca3000.c                        |  2 +-
 drivers/iio/adc/ade9000.c                          | 31 +++++------
 drivers/iio/adc/adi-axi-adc.c                      |  4 ++
 drivers/iio/adc/aspeed_adc.c                       |  4 +-
 drivers/iio/adc/axp288_adc.c                       |  8 +++
 drivers/iio/adc/max1363.c                          |  8 +++
 drivers/iio/adc/rohm-bd79124.c                     | 20 ++++---
 drivers/iio/adc/sun4i-gpadc-iio.c                  | 10 ++--
 drivers/iio/adc/xilinx-xadc-core.c                 |  9 ++--
 drivers/iio/buffer/industrialio-buffer-dmaengine.c | 16 ++++--
 .../iio/common/inv_sensors/inv_sensors_timestamp.c | 11 ++--
 drivers/iio/dac/mcp47a1.c                          |  4 +-
 drivers/iio/dac/rohm-bd79703.c                     |  3 ++
 drivers/iio/frequency/adf4377.c                    |  4 +-
 drivers/iio/frequency/admv1013.c                   |  9 ++--
 drivers/iio/gyro/adis16136.c                       |  2 +-
 drivers/iio/health/max30102.c                      | 12 +++--
 drivers/iio/imu/adis16400.c                        |  2 +-
 drivers/iio/imu/adis16480.c                        |  4 +-
 drivers/iio/industrialio-buffer.c                  |  3 +-
 drivers/iio/industrialio-trigger.c                 |  2 +
 drivers/iio/light/gp2ap020a00f.c                   |  2 +
 drivers/iio/light/rohm-bu27034.c                   | 62 +++++++++++++---------
 drivers/iio/pressure/bmp280-core.c                 |  2 +-
 drivers/iio/pressure/rohm-bm1390.c                 |  2 +-
 drivers/iio/proximity/aw96103.c                    | 30 ++++++++---
 drivers/iio/proximity/pulsedlight-lidar-lite-v2.c  |  4 +-
 drivers/iio/proximity/sx9324.c                     |  2 +-
 drivers/iio/proximity/vl53l0x-i2c.c                |  3 ++
 31 files changed, 217 insertions(+), 106 deletions(-)
Merging watchdog-fixes/watchdog (d83b7502bb087 MAINTAINERS: Update URI for watchdog tree)
$ git merge -m Merge branch 'watchdog' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog-fixes/watchdog
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 MAINTAINERS                    |  2 +-
 drivers/watchdog/msc313e_wdt.c |  1 +
 drivers/watchdog/sunxi_wdt.c   | 45 +++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 46 insertions(+), 2 deletions(-)
Merging counter-current/counter-current (f1a3a9946aab6 counter: microchip-tcb-capture: Fix DT channel validation)
$ git merge -m Merge branch 'counter-current' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current
Already up to date.
Merging char-misc.current/char-misc-linus (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'char-misc-linus' of https://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 (6d49beec658f6 soundwire: dmi-quirks: Disable ghost Realtek on Asus GX651AX)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes
Merge made by the 'ort' strategy.
 drivers/soundwire/dmi-quirks.c | 7 +++++++
 1 file changed, 7 insertions(+)
Merging thunderbolt-fixes/fixes (e6df180e976fd Revert "thunderbolt: xdomain: Notify peers after enumeration")
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes
Merge made by the 'ort' strategy.
 drivers/thunderbolt/ctl.c     | 63 ++++++++++++++++++-------------------
 drivers/thunderbolt/nhi.c     |  5 +++
 drivers/thunderbolt/switch.c  |  9 +++++-
 drivers/thunderbolt/tb.c      | 37 ++++++++++++++--------
 drivers/thunderbolt/test.c    | 58 +++++++++++++++++++++++++++-------
 drivers/thunderbolt/tunnel.c  | 73 ++++++++++++++++++++++++++++---------------
 drivers/thunderbolt/tunnel.h  |  8 +++--
 drivers/thunderbolt/xdomain.c |  1 -
 include/linux/thunderbolt.h   |  3 ++
 9 files changed, 170 insertions(+), 87 deletions(-)
Merging input-current/for-linus (85f080fb87ed5 Input: cyttsp5 - clamp the HID report size before memcpy)
$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus
Auto-merging drivers/input/keyboard/atkbd.c
Merge made by the 'ort' strategy.
 .../devicetree/bindings/input/mediatek,mt6779-keypad.yaml   |  1 +
 drivers/input/evdev.c                                       |  2 ++
 drivers/input/input-compat.c                                |  2 ++
 drivers/input/keyboard/adp5588-keys.c                       | 12 ++++++------
 drivers/input/keyboard/atkbd.c                              |  8 ++++++++
 drivers/input/rmi4/rmi_driver.c                             | 13 +++++++++++++
 drivers/input/rmi4/rmi_smbus.c                              | 10 +++++-----
 drivers/input/touchscreen/cyttsp5.c                         |  1 +
 8 files changed, 38 insertions(+), 11 deletions(-)
Merging crypto-current/master (60892a384aa1e crypto: x86/aria - add missing vzeroupper in AVX-512 code)
$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master
Merge made by the 'ort' strategy.
 arch/x86/crypto/aria-aesni-avx2-asm_64.S  | 6 ++++++
 arch/x86/crypto/aria-gfni-avx512-asm_64.S | 3 +++
 2 files changed, 9 insertions(+)
Merging libcrypto-fixes/libcrypto-fixes (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'libcrypto-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes
Already up to date.
Merging vfio-fixes/for-linus (e242e974e812e vfio: selftests: Add luuid to libvfio.mk's list of libraries, not to the Makefile)
$ git merge -m Merge branch 'for-linus' of https://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus
Already up to date.
Merging kselftest-fixes/fixes (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes
Already up to date.
Merging dmaengine-fixes/fixes (a7df136ec529e dmaengine: sprd: Fix runtime PM reference leak in probe)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes
Merge made by the 'ort' strategy.
 drivers/dma/mmp_pdma.c        | 3 +--
 drivers/dma/sprd-dma.c        | 3 +--
 drivers/dma/ti/k3-udma-glue.c | 5 +++--
 3 files changed, 5 insertions(+), 6 deletions(-)
Merging backlight-fixes/for-backlight-fixes (dc59e4fea9d83 Linux 7.2-rc1)
$ git merge -m Merge branch 'for-backlight-fixes' of https://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 (21f027016b129 mtd: rawnand: cadence: Initialize IRQ state before requesting IRQ)
$ git merge -m Merge branch 'mtd/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes
Merge made by the 'ort' strategy.
 drivers/mtd/chips/cfi_cmdset_0001.c            | 42 ++++++++-----
 drivers/mtd/devices/block2mtd.c                |  2 +-
 drivers/mtd/devices/mtd_intel_dg.c             |  3 +-
 drivers/mtd/mtdcore.c                          |  3 +-
 drivers/mtd/nand/ecc.c                         |  7 +++
 drivers/mtd/nand/raw/cadence-nand-controller.c |  6 +-
 drivers/mtd/nand/raw/vf610_nfc.c               | 85 +++++++++++++++++++++-----
 drivers/mtd/nand/spi/core.c                    | 43 +++++++++----
 include/linux/mtd/nand.h                       |  2 +
 9 files changed, 145 insertions(+), 48 deletions(-)
Merging mfd-fixes/for-mfd-fixes (d5d2d7a8d8be1 MAINTAINERS: Add a mailing list entry to MFD)
$ git merge -m Merge branch 'for-mfd-fixes' of https://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 (37bef2170d4c8 media: mediatek: vcodec: bound AV1 tile-start copy to the array capacity)
$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes
Merge made by the 'ort' strategy.
 .../media/platform/dreamchip/rppx1/rpp_params.c    |  1 +
 drivers/media/platform/dreamchip/rppx1/rppx1_bls.c |  2 +-
 .../vcodec/decoder/vdec/vdec_av1_req_lat_if.c      |  5 +-
 .../platform/rockchip/rkvdec/rkvdec-hevc-common.c  | 14 ++++--
 .../media/platform/rockchip/rkvdec/rkvdec-hevc.c   |  7 ++-
 .../platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c |  2 +
 .../platform/verisilicon/hantro_g2_hevc_dec.c      |  6 ++-
 .../verisilicon/rockchip_vpu981_hw_av1_dec.c       | 57 ++++++++++++++++++----
 drivers/media/v4l2-core/v4l2-ctrls-core.c          | 32 ++++++++++++
 drivers/media/v4l2-core/v4l2-h264.c                |  3 +-
 include/media/v4l2-hevc.h                          | 41 ++++++++++++++++
 11 files changed, 149 insertions(+), 21 deletions(-)
 create mode 100644 include/media/v4l2-hevc.h
Merging reset-fixes/reset/fixes (71827776667f4 reset: imx7: Correct polarity of MIPI CSI resets on i.MX8MQ)
$ git merge -m Merge branch 'reset/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux reset-fixes/reset/fixes
Already up to date.
Merging mips-fixes/mips-fixes (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'mips-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes
Already up to date.
Merging at91-fixes/at91-fixes (dc59e4fea9d83 Linux 7.2-rc1)
$ git merge -m Merge branch 'at91-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes
Already up to date.
Merging omap-fixes/fixes (2fabd2f406d0c ARM: dts: ti/omap: dra7: fix PCIe PHY clock divider definition)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes
Merge made by the 'ort' strategy.
 arch/arm/boot/dts/ti/omap/dra7xx-clocks.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging tegra-fixes/fixes (0bc9d07096f17 Merge branch for-7.3/arm64/dt into fixes)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-fixes/fixes
Merge made by the 'ort' strategy.
 .../boot/dts/nvidia/tegra264-p4071-0000+p3834.dtsi |  13 ++
 arch/arm64/boot/dts/nvidia/tegra264.dtsi           | 180 ++++++++++++++++++---
 drivers/soc/tegra/fuse/tegra-apbmisc.c             |   2 +-
 3 files changed, 170 insertions(+), 25 deletions(-)
Merging kvm-fixes/master (d599822bdb66a Merge tag 'kvm-s390-master-7.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
Auto-merging arch/s390/kvm/s390/s390.c
Merge made by the 'ort' strategy.
 arch/s390/kernel/uv.c             |  8 ++--
 arch/s390/kvm/gmap/dat.c          | 65 ++++++++++++++++------------
 arch/s390/kvm/gmap/dat.h          | 10 ++---
 arch/s390/kvm/gmap/gmap.c         |  6 ++-
 arch/s390/kvm/gmap/kvm_mmu.c      | 91 ++++++++++++++++-----------------------
 arch/s390/kvm/gmap/kvm_mmu.h      |  4 --
 arch/s390/kvm/s390/gaccess.c      | 13 ++++++
 arch/s390/kvm/s390/interrupt.c    | 81 +++++++++++++++++-----------------
 arch/s390/kvm/s390/s390.c         |  3 +-
 arch/s390/kvm/s390/s390.h         |  2 +-
 drivers/s390/crypto/vfio_ap_ops.c | 18 ++++++--
 11 files changed, 157 insertions(+), 144 deletions(-)
Merging kvms390-fixes/master (f47190b08b71e s390/uv: Prevent potential out-of-bounds read)
$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
Already up to date.
Merging kvm-arm-fixes/fixes (679d7201c1f09 KVM: arm64: Reject guest_memfd memslots when the VM has MTE)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm-fixes/fixes
Already up to date.
Merging hwmon-fixes/hwmon (a15f90964998e hwmon: (corsair-cpro) Remove debugfs entries when probe fails)
$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon
Auto-merging drivers/hwmon/applesmc.c
Merge made by the 'ort' strategy.
 Documentation/hwmon/gpd-fan.rst          |   2 +-
 Documentation/hwmon/hwmon-kernel-api.rst |  15 +++
 drivers/hwmon/applesmc.c                 |   7 +-
 drivers/hwmon/aspeed-pwm-tacho.c         |   4 +-
 drivers/hwmon/chipcap2.c                 |   9 +-
 drivers/hwmon/corsair-cpro.c             |  24 +++--
 drivers/hwmon/gpio-fan.c                 |  13 ++-
 drivers/hwmon/hwmon.c                    |  31 +++---
 drivers/hwmon/ina2xx.c                   | 163 ++++++++++++++++++++++++++-----
 drivers/hwmon/ltc4282.c                  |   2 +-
 drivers/hwmon/mcp9982.c                  |   2 +
 drivers/hwmon/pmbus/pmbus_core.c         |   4 +-
 drivers/hwmon/sht4x.c                    |   8 +-
 drivers/hwmon/yogafan.c                  |   2 +-
 14 files changed, 223 insertions(+), 63 deletions(-)
Merging nvdimm-fixes/libnvdimm-fixes (a8aec14230322 nvdimm/bus: Fix potential use after free in asynchronous initialization)
$ git merge -m Merge branch 'libnvdimm-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes
Already up to date.
Merging cxl-fixes/fixes (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes
Already up to date.
Merging dma-mapping-fixes/dma-mapping-fixes (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'dma-mapping-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping-fixes/dma-mapping-fixes
Already up to date.
Merging drivers-x86-fixes/fixes (312fd3f3a85b8 platform/x86: x86-android-tablets: use shared battery swnode group on Yoga Tab 2)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes
Merge made by the 'ort' strategy.
 drivers/platform/x86/amd/pmf/spc.c                 |  2 +-
 drivers/platform/x86/asus-laptop.c                 |  4 +--
 drivers/platform/x86/hp/hp-wmi.c                   |  2 +-
 drivers/platform/x86/x86-android-tablets/core.c    | 35 +++++++++++++++-----
 drivers/platform/x86/x86-android-tablets/lenovo.c  | 37 +++++++---------------
 .../x86/x86-android-tablets/x86-android-tablets.h  |  2 ++
 6 files changed, 44 insertions(+), 38 deletions(-)
Merging samsung-krzk-fixes/fixes (48f344b3e8321 soc: samsung: exynos-pmu: fix use-after-free of interrupt generator node)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes
Merge made by the 'ort' strategy.
 drivers/soc/samsung/exynos-pmu.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
Merging pinctrl-samsung-fixes/fixes (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes
Already up to date.
Merging pinctrl-qcom-fixes/pinctrl-qcom/for-current (818103dc7f599 pinctrl: qcom: ipq5210: Publish the OF module alias)
$ git merge -m Merge branch 'pinctrl-qcom/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pinctrl-qcom-fixes/pinctrl-qcom/for-current
Merge made by the 'ort' strategy.
 .../bindings/pinctrl/qcom,nord-tlmm.yaml           |  7 +++--
 drivers/pinctrl/qcom/pinctrl-ipq5210.c             |  1 +
 drivers/pinctrl/qcom/pinctrl-nord.c                | 34 +++++++++++++++-------
 3 files changed, 28 insertions(+), 14 deletions(-)
Merging devicetree-fixes/dt/linus (5bb01c657ff9f of: fix out-of-bounds read in of_alias_scan() stem parser)
$ git merge -m Merge branch 'dt/linus' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus
Already up to date.
Merging dt-krzk-fixes/fixes (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes
Already up to date.
Merging scsi-fixes/fixes (af8c27375733f scsi: megaraid_sas: Limit NVMe request size to the PRP chain frame)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes
Already up to date.
Merging drm-fixes/drm-fixes (c96294afbcb57 Merge tag 'drm-xe-fixes-2026-09-03' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes)
$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes
Already up to date.
Merging drm-intel-fixes/for-linux-next-fixes (df2908090cda3 Linux 7.3-rc2)
$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel-fixes/for-linux-next-fixes
Already up to date.
Merging mmc-fixes/fixes (308d05225281d mmc: sdhci_am654: Fallback to DT-provided itap delay on DDR50 tuning failure)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes
Merge made by the 'ort' strategy.
 drivers/memstick/core/ms_block.c |  2 ++
 drivers/mmc/core/host.c          |  1 +
 drivers/mmc/host/mmc_hsq.c       |  8 +++++++-
 drivers/mmc/host/mmci.c          |  3 +++
 drivers/mmc/host/mxcmmc.c        |  4 ++++
 drivers/mmc/host/sdhci_am654.c   | 43 ++++++++++++++++++++++++++--------------
 6 files changed, 45 insertions(+), 16 deletions(-)
Merging rtc-fixes/rtc-fixes (254f49634ee16 Linux 7.1-rc1)
$ git merge -m Merge branch 'rtc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes
Already up to date.
Merging gnss-fixes/gnss-linus (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'gnss-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus
Already up to date.
Merging hyperv-fixes/hyperv-fixes (0fd49f7bfb8f1 mshv_vtl: bounds-check cpu index in vtl mmap fault handler)
$ git merge -m Merge branch 'hyperv-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes
Auto-merging drivers/hv/connection.c
Merge made by the 'ort' strategy.
Merging risc-v-fixes/fixes (b94cec5761d22 riscv: skip software algning code for HAVE_EFFICIENT_UNALIGNED_ACCESS)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes
Merge made by the 'ort' strategy.
 Documentation/arch/riscv/hwprobe.rst               |  8 +-
 Documentation/devicetree/bindings/riscv/cpus.yaml  |  8 +-
 .../zh_CN/arch/riscv/patch-acceptance.rst          | 44 +++++++---
 arch/riscv/Kconfig                                 |  2 +-
 arch/riscv/include/asm/bug.h                       |  5 --
 arch/riscv/include/asm/switch_to.h                 |  4 +-
 arch/riscv/kernel/cpufeature.c                     | 20 ++++-
 arch/riscv/kernel/patch.c                          |  2 +
 arch/riscv/kernel/process.c                        |  4 +-
 arch/riscv/kernel/sys_hwprobe.c                    |  5 +-
 arch/riscv/kernel/usercfi.c                        |  5 +-
 arch/riscv/lib/uaccess.S                           |  5 +-
 arch/riscv/mm/init.c                               |  4 +-
 drivers/perf/riscv_pmu_legacy.c                    |  5 +-
 drivers/perf/riscv_pmu_sbi.c                       | 98 +++++++++++++++-------
 include/linux/perf/riscv_pmu.h                     |  2 +-
 tools/testing/selftests/riscv/cfi/cfi_rv_test.h    |  2 +-
 tools/testing/selftests/riscv/hwprobe/hwprobe.c    | 20 ++++-
 18 files changed, 169 insertions(+), 74 deletions(-)
Merging riscv-dt-fixes/riscv-dt-fixes (42c57c049054d riscv: dts: starfive: jh7110-common: fix jh7110 SoC boot from SD-card.)
$ git merge -m Merge branch 'riscv-dt-fixes' of https://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-common.dtsi | 1 +
 1 file changed, 1 insertion(+)
Merging riscv-soc-fixes/riscv-soc-fixes (dc59e4fea9d83 Linux 7.2-rc1)
$ git merge -m Merge branch 'riscv-soc-fixes' of https://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 (19272b37aa4f8 Linux 6.16-rc1)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes
Already up to date.
Merging spdx/spdx-linus (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'spdx-linus' of https://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 (1f1d0812f6a8a gpiolib: of: don't mark hog nodes OF_POPULATED before a chip is found)
$ git merge -m Merge branch 'gpio/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current
Merge made by the 'ort' strategy.
 drivers/gpio/gpiolib-of.c     | 6 +++---
 drivers/gpio/gpiolib-shared.c | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)
Merging gpio-intel-fixes/fixes (32c7f7f80e5f7 gpio: crystalcove: add missing MODULE_ALIAS())
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes
Merge made by the 'ort' strategy.
 drivers/gpio/gpio-crystalcove.c | 1 +
 1 file changed, 1 insertion(+)
Merging pinctrl-intel-fixes/fixes (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes
Already up to date.
Merging auxdisplay-fixes/fixes (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes
Already up to date.
Merging kunit-fixes/kunit-fixes (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'kunit-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes
Already up to date.
Merging renesas-fixes/fixes (2ac7bad110be6 arm64: dts: renesas: r9a09g087: Switch GBETH TX queue scheduling to WRR)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes
Merge made by the 'ort' strategy.
 arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 10 ++++++++++
 arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 10 ++++++++++
 arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 10 ++++++++++
 arch/arm64/boot/dts/renesas/r9a09g077.dtsi | 27 +++++++++++++++++++++++++++
 arch/arm64/boot/dts/renesas/r9a09g087.dtsi | 27 +++++++++++++++++++++++++++
 5 files changed, 84 insertions(+)
Merging perf-current/perf-tools (aadea57f53288 perf powerpc-vpadtl: Fix raw_size of DTL samples)
$ git merge -m Merge branch 'perf-tools' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git perf-current/perf-tools
Merge made by the 'ort' strategy.
 tools/perf/util/powerpc-vpadtl.c |  2 +-
 tools/perf/util/symbol.c         | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
Merging efi-fixes/urgent (d8809f6931065 efi: sysfb_efi: Extend quirk to cover IdeaPad Duet 3 10IGL5-LTE)
$ git merge -m Merge branch 'urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent
Already up to date.
Merging battery-fixes/fixes (160a783aa65b7 power: supply: bq25890: fix the -10 C NTC lookup entry)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes
Already up to date.
Merging iommufd-fixes/for-rc (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc
Already up to date.
Merging rust-fixes/rust-fixes (2ac74c6db40ad rust: allow `clippy::as_underscore` in the generated bindings)
$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes
Merge made by the 'ort' strategy.
 drivers/gpu/drm/drm_panic_qr.rs | 4 ++--
 rust/bindings/lib.rs            | 1 +
 rust/kernel/num.rs              | 9 ++++++++-
 rust/pin-init/src/lib.rs        | 8 +-------
 rust/uapi/lib.rs                | 1 +
 samples/rust/rust_print_main.rs | 8 ++++----
 6 files changed, 17 insertions(+), 14 deletions(-)
Merging w1-fixes/fixes (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes
Already up to date.
Merging pmdomain-fixes/fixes (df2908090cda3 Linux 7.3-rc2)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes
Already up to date.
Merging i2c-andi-fixes/i2c/i2c-fixes (b15b548d52b43 i2c: core: fix debugfs UAF on adapter removal)
$ git merge -m Merge branch 'i2c/i2c-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-andi-fixes/i2c/i2c-fixes
Already up to date.
Merging i2c-rust-fixes/rust-i2c-fixes (4eb422482ca5d rust: i2c: fix I2cAdapter refcounts double increment)
$ git merge -m Merge branch 'rust-i2c-fixes' of https://github.com/ikrtn/rust-for-linux i2c-rust-fixes/rust-i2c-fixes
Already up to date.
Merging sparc-fixes/for-linus (254f49634ee16 Linux 7.1-rc1)
$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus
Already up to date.
Merging clk-fixes/clk-fixes (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes
Already up to date.
Merging thead-clk-fixes/thead-clk-fixes (dc59e4fea9d83 Linux 7.2-rc1)
$ git merge -m Merge branch 'thead-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk-fixes/thead-clk-fixes
Already up to date.
Merging tenstorrent-clk-fixes/tenstorrent-clk-fixes (6de23f81a5e08 Linux 7.0-rc1)
$ git merge -m Merge branch 'tenstorrent-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-clk-fixes/tenstorrent-clk-fixes
Already up to date.
Merging fustini-config-fixes/riscv-config-fixes (254f49634ee16 Linux 7.1-rc1)
$ git merge -m Merge branch 'riscv-config-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git fustini-config-fixes/riscv-config-fixes
Already up to date.
Merging pwrseq-fixes/pwrseq/for-current (3b54dbd119805 power: sequencing: Fix build issue with COMPILE_TEST)
$ git merge -m Merge branch 'pwrseq/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current
Merge made by the 'ort' strategy.
 drivers/power/sequencing/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Merging thead-dt-fixes/thead-dt-fixes (dc59e4fea9d83 Linux 7.2-rc1)
$ git merge -m Merge branch 'thead-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt-fixes/thead-dt-fixes
Already up to date.
Merging ftrace-fixes/ftrace/fixes (1650a1b6cb1ae fgraph: Check ftrace_pids_enabled on registration for early filtering)
$ git merge -m Merge branch 'ftrace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace-fixes/ftrace/fixes
Already up to date.
Merging ring-buffer-fixes/ring-buffer/fixes (057caace5214d tracing: Create output file from cmd_check_undefined)
$ git merge -m Merge branch 'ring-buffer/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ring-buffer-fixes/ring-buffer/fixes
Already up to date.
Merging trace-fixes/trace/fixes (d80e12156f1fd ring-buffer: Use a macro for static buffer bits)
$ git merge -m Merge branch 'trace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-fixes/trace/fixes
Already up to date.
Merging tracefs-fixes/tracefs/fixes (07004a8c4b572 eventfs: Hold eventfs_mutex and SRCU when remount walks events)
$ git merge -m Merge branch 'tracefs/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes
Already up to date.
Merging spacemit-fixes/fixes (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/spacemit/linux spacemit-fixes/fixes
Already up to date.
Merging tip-fixes/tip/urgent (102717cab52c1 Merge branch into tip/master: 'x86/urgent')
  4846278477f09 ("x86/mm: Fix userspace data loss with MADV_FREE and THP")
$ git merge -m Merge branch 'tip/urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent
Merge made by the 'ort' strategy.
 arch/x86/kernel/alternative.c | 39 ++++++++++++++++++++++++---
 arch/x86/kernel/amd_node.c    | 19 +++++++++-----
 arch/x86/kernel/cpu/mce/amd.c |  2 +-
 arch/x86/mm/pat/set_memory.c  | 61 +++++++++++++++++++++++++++++++------------
 include/linux/mmap_lock.h     |  2 ++
 5 files changed, 97 insertions(+), 26 deletions(-)
Merging kexec-fixes/kexec-fixes (a901b0778ae82 Merge patch series "kexec: fix probe error codes and error propagation")
$ git merge -m Merge branch 'kexec-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git kexec-fixes/kexec-fixes
Merge made by the 'ort' strategy.
 arch/arm64/kernel/kexec_image.c   |  4 ++--
 arch/loongarch/kernel/kexec_efi.c |  4 ++--
 arch/riscv/kernel/kexec_image.c   |  4 ++--
 kernel/kexec_elf.c                |  4 ++--
 kernel/kexec_file.c               | 12 +++++++-----
 5 files changed, 15 insertions(+), 13 deletions(-)
Merging liveupdate-fixes/fixes (3a0b8fa2eb36a kho: fix size calculation in kho_preserved_memory_reserve())
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git liveupdate-fixes/fixes
Already up to date.
Merging drm-msm-fixes/msm-fixes (e2332abed2a4d drm/msm: Only fini scheduler after successful init)
$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes
Already up to date.
Merging uml-fixes/fixes (af421e9aed392 um: vector: fix use-after-free in vector_mmsg_rx())
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes
Already up to date.
Merging fwctl-fixes/for-rc (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl-fixes/for-rc
Already up to date.
Merging devsec-tsm-fixes/fixes (c3fd16c3b98ed virt: tdx-guest: Fix handling of host controlled 'quote' buffer length)
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm-fixes/fixes
Already up to date.
Merging drm-rust-fixes/for-linux-next-fixes (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust-fixes/for-linux-next-fixes
Already up to date.
Merging tenstorrent-dt-fixes/tenstorrent-dt-fixes (6de23f81a5e08 Linux 7.0-rc1)
$ git merge -m Merge branch 'tenstorrent-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-dt-fixes/tenstorrent-dt-fixes
Already up to date.
Merging nfc-fixes/for-linus (50a0fd2402776 selftests: nci: Correct pthread_create return value check)
$ git merge -m Merge branch 'for-linus' of https://codeberg.org/linux-nfc/linux.git nfc-fixes/for-linus
Merge made by the 'ort' strategy.
 drivers/nfc/nfcmrvl/fw_dnld.c         | 11 ++++++++---
 drivers/nfc/port100.c                 |  7 +++++++
 drivers/nfc/st21nfca/i2c.c            | 29 +++++++++++++++++++----------
 net/nfc/llcp_core.c                   | 25 +++++++++++++++++++++++++
 tools/testing/selftests/nci/nci_dev.c | 12 +++++++-----
 5 files changed, 66 insertions(+), 18 deletions(-)
Merging drm-misc-fixes/for-linux-next-fixes (2b39d680c9e0f accel: ethosu: Ensure SRAM region size matches job)
$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes
Merge made by the 'ort' strategy.
 drivers/accel/ethosu/ethosu_device.h            |  1 +
 drivers/accel/ethosu/ethosu_drv.c               |  3 +--
 drivers/accel/ethosu/ethosu_gem.c               |  9 +++++++++
 drivers/accel/ethosu/ethosu_job.c               | 16 +++++++---------
 drivers/gpu/drm/rockchip/Kconfig                |  3 +++
 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c |  7 ++++---
 6 files changed, 25 insertions(+), 14 deletions(-)
Merging rust/rust-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next
Already up to date.
Merging rust-interop/interop-next (05f7e89ab9731 Linux 6.19)
$ git merge -m Merge branch 'interop-next' of https://github.com/Rust-for-Linux/linux.git rust-interop/interop-next
Already up to date.
Merging rust-alloc/alloc-next (82134823a07b4 MAINTAINERS: add Alice Ryhl as co-maintainer for Rust [ALLOC])
$ git merge -m Merge branch 'alloc-next' of https://github.com/Rust-for-Linux/linux.git rust-alloc/alloc-next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)
Merging rust-io/io-next (86731a2a651e5 Linux 6.16-rc3)
$ git merge -m Merge branch 'io-next' of https://github.com/Rust-for-Linux/linux.git rust-io/io-next
Already up to date.
Merging rust-pin-init/pin-init-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'pin-init-next' of https://github.com/Rust-for-Linux/linux.git rust-pin-init/pin-init-next
Already up to date.
Merging rust-timekeeping/timekeeping-next (ddb1444d33351 hrtimer: add usage examples to documentation)
$ git merge -m Merge branch 'timekeeping-next' of https://github.com/Rust-for-Linux/linux.git rust-timekeeping/timekeeping-next
Already up to date.
Merging rust-xarray/xarray-next (c455f19bbe610 rust: xarray: add __rust_helper to helpers)
$ git merge -m Merge branch 'xarray-next' of https://github.com/Rust-for-Linux/linux.git rust-xarray/xarray-next
Already up to date.
Merging rust-analyzer/rust-analyzer-next (5f45afb8ab04d scripts: generate_rust_analyzer.py: pass cfg to macros crate)
$ git merge -m Merge branch 'rust-analyzer-next' of https://github.com/Rust-for-Linux/linux.git rust-analyzer/rust-analyzer-next
Auto-merging scripts/generate_rust_analyzer.py
Merge made by the 'ort' strategy.
 scripts/generate_rust_analyzer.py | 1 +
 1 file changed, 1 insertion(+)
Merging mm/for-next (a1bb5604bd610 Merge https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-unstable into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mm/linux.git mm/for-next
Auto-merging MAINTAINERS
Auto-merging arch/riscv/Kconfig
Auto-merging arch/x86/mm/pat/set_memory.c
Auto-merging include/linux/mmap_lock.h
Auto-merging include/linux/sched.h
Merge made by the 'ort' strategy.
 Documentation/ABI/testing/sysfs-kernel-mm-damon    |  15 +-
 Documentation/admin-guide/cgroup-v2.rst            |   4 +
 Documentation/admin-guide/mm/damon/usage.rst       |  18 +-
 Documentation/admin-guide/mm/ksm.rst               |   8 +-
 Documentation/core-api/memory-allocation.rst       |  30 +-
 Documentation/mm/damon/design.rst                  |  26 +-
 Documentation/mm/damon/maintainer-profile.rst      |  19 +-
 Documentation/mm/page_owner.rst                    |   8 +-
 MAINTAINERS                                        |   6 +-
 arch/alpha/include/asm/pgtable.h                   |   7 -
 arch/arc/include/asm/pgtable-levels.h              |  11 -
 arch/arm/Kconfig                                   |   1 -
 arch/arm/include/asm/pgtable.h                     |   7 -
 arch/arm/kernel/traps.c                            |  17 -
 arch/arm64/Kconfig                                 |   1 -
 arch/arm64/include/asm/pgtable.h                   |  15 -
 arch/arm64/include/asm/set_memory.h                |   5 +-
 arch/arm64/mm/pageattr.c                           |  24 +-
 arch/csky/include/asm/pgtable.h                    |   4 -
 arch/hexagon/include/asm/pgtable.h                 |   3 -
 arch/loongarch/Kconfig                             |   1 -
 arch/loongarch/include/asm/pgtable.h               |  13 -
 arch/loongarch/include/asm/set_memory.h            |   5 +-
 arch/loongarch/mm/init.c                           |   4 +-
 arch/loongarch/mm/pageattr.c                       |  27 +-
 arch/m68k/include/asm/mcf_pgtable.h                |   6 -
 arch/m68k/include/asm/motorola_pgtable.h           |   8 -
 arch/m68k/include/asm/sun3_pgtable.h               |   7 -
 arch/microblaze/include/asm/pgtable.h              |   7 -
 arch/mips/include/asm/pgtable-32.h                 |  10 -
 arch/mips/include/asm/pgtable-64.h                 |  13 -
 arch/nios2/include/asm/pgtable.h                   |   7 -
 arch/openrisc/include/asm/pgtable.h                |   7 -
 arch/parisc/include/asm/pgtable.h                  |   9 -
 arch/parisc/kernel/pci-dma.c                       |   6 +-
 arch/powerpc/include/asm/book3s/32/pgtable.h       |   2 -
 arch/powerpc/include/asm/book3s/64/pgtable.h       |   7 -
 arch/powerpc/include/asm/nohash/32/pgtable.h       |   2 -
 arch/powerpc/include/asm/nohash/64/pgtable-4k.h    |   3 -
 arch/powerpc/include/asm/nohash/64/pgtable.h       |   5 -
 arch/powerpc/platforms/powernv/Kconfig             |   1 -
 arch/powerpc/platforms/pseries/Kconfig             |   1 -
 arch/riscv/Kconfig                                 |   1 -
 arch/riscv/include/asm/page.h                      |   6 -
 arch/riscv/include/asm/pgtable-64.h                |   9 -
 arch/riscv/include/asm/pgtable.h                   |   4 -
 arch/riscv/include/asm/set_memory.h                |   5 +-
 arch/riscv/mm/pageattr.c                           |  23 +-
 arch/s390/Kconfig                                  |   1 -
 arch/s390/include/asm/pgtable.h                    |  11 -
 arch/s390/include/asm/set_memory.h                 |   5 +-
 arch/s390/mm/pageattr.c                            |  20 +-
 arch/sh/include/asm/pgtable-3level.h               |   3 -
 arch/sh/include/asm/pgtable_32.h                   |  13 -
 arch/sh/mm/init.c                                  |  16 +-
 arch/sparc/include/asm/pgtable_32.h                |   3 -
 arch/sparc/include/asm/pgtable_64.h                |  10 -
 arch/um/include/asm/pgtable-2level.h               |   7 -
 arch/um/include/asm/pgtable-4level.h               |  13 -
 arch/x86/Kconfig                                   |   3 -
 arch/x86/include/asm/pgtable-2level.h              |   5 -
 arch/x86/include/asm/pgtable-3level.h              |  11 -
 arch/x86/include/asm/pgtable_64.h                  |  18 -
 arch/x86/include/asm/set_memory.h                  |   5 +-
 arch/x86/include/asm/string_64.h                   |  85 ++++-
 arch/x86/mm/pat/set_memory.c                       |  20 +-
 arch/xtensa/include/asm/pgtable.h                  |   4 -
 drivers/android/binder/page_range.rs               |  19 +-
 drivers/android/binder_alloc.c                     |  63 ++--
 drivers/block/zram/zram_drv.c                      |  26 +-
 drivers/char/Makefile                              |   2 +-
 drivers/nvdimm/pmem.c                              |   2 +-
 drivers/nvdimm/pmem.h                              |  12 -
 fs/Kconfig                                         |   1 -
 fs/iomap/buffered-io.c                             |   3 +-
 fs/proc/base.c                                     |   3 +-
 fs/proc/internal.h                                 |   2 -
 fs/proc/task_mmu.c                                 |  93 -----
 fs/xfs/libxfs/xfs_btree.c                          |  18 +-
 fs/xfs/xfs_platform.h                              |   4 -
 include/asm-generic/pgtable-nop4d.h                |   1 -
 include/asm-generic/pgtable-nopmd.h                |   1 -
 include/asm-generic/pgtable-nopud.h                |   1 -
 include/linux/compaction.h                         |  11 +-
 include/linux/damon.h                              |  53 ++-
 include/linux/gfp_types.h                          |   2 +-
 include/linux/hugetlb.h                            |   8 +-
 include/linux/memblock.h                           |   1 -
 include/linux/memcontrol.h                         |  46 +--
 include/linux/mm.h                                 |  57 +--
 include/linux/mm_types.h                           |   8 +-
 include/linux/mmap_lock.h                          |  94 +++--
 include/linux/mmzone.h                             |  96 ++---
 include/linux/page-flags.h                         |   4 +-
 include/linux/page_counter.h                       |   1 +
 include/linux/pagemap.h                            |   3 +-
 include/linux/pgtable.h                            |  14 +
 include/linux/sched.h                              |   4 +-
 include/linux/set_memory.h                         |  12 +-
 include/linux/shmem_fs.h                           |  12 +-
 include/linux/string.h                             |  13 +
 include/linux/swap.h                               |  13 +-
 include/net/mana/mana.h                            |   4 +-
 include/trace/events/huge_memory.h                 |  18 +-
 include/trace/events/mmflags.h                     |  43 +++
 include/trace/events/vmscan.h                      |  14 -
 kernel/bpf/stackmap.c                              |  17 +-
 kernel/bpf/task_iter.c                             |   2 +-
 kernel/fork.c                                      |   2 -
 kernel/power/snapshot.c                            |   4 +-
 lib/codetag.c                                      |  10 +-
 mm/Kconfig                                         |  17 -
 mm/Kconfig.debug                                   |   1 -
 mm/Makefile                                        |   3 +-
 mm/alloc_tag.c                                     |  14 +-
 drivers/char/mem.c => mm/char-mem.c                |  21 +-
 mm/cma.h                                           |  23 +-
 mm/compaction.c                                    |   9 +-
 mm/damon/core.c                                    | 234 +++++++++---
 mm/damon/lru_sort.c                                |  10 -
 mm/damon/ops-common.c                              |  30 +-
 mm/damon/paddr.c                                   |  49 ++-
 mm/damon/reclaim.c                                 |   8 -
 mm/damon/sysfs-schemes.c                           |   4 +
 mm/damon/sysfs.c                                   | 302 +++++++++++++++-
 mm/damon/tests/core-kunit.h                        | 290 +++++++++++++--
 mm/damon/vaddr.c                                   |  26 +-
 mm/debug.c                                         |   4 -
 mm/execmem.c                                       |  40 +--
 mm/gup.c                                           | 185 +++++-----
 mm/gup_test.c                                      |   2 +-
 mm/huge_memory.c                                   |  73 ++--
 mm/hugetlb.c                                       | 164 +++++----
 mm/hugetlb_sysfs.c                                 |  10 +-
 mm/hugetlb_vmemmap.c                               | 103 +-----
 mm/hugetlb_vmemmap.h                               |  15 +-
 mm/init-mm.c                                       |   2 -
 mm/internal.h                                      |  36 +-
 mm/khugepaged.c                                    |  39 +-
 mm/ksm.c                                           |   7 +-
 mm/list_lru.c                                      |   9 +-
 mm/madvise.c                                       |   3 +
 mm/memblock.c                                      |  16 +-
 mm/memcontrol-v1.c                                 | 392 +-------------------
 mm/memcontrol-v1.h                                 |  12 +-
 mm/memcontrol.c                                    | 155 +++++---
 mm/memfd.c                                         |  31 +-
 mm/memory.c                                        |  93 ++---
 mm/mempolicy.c                                     | 170 +++++----
 mm/migrate_device.c                                |   6 +-
 mm/mincore.c                                       |   2 +-
 mm/mm_init.c                                       | 164 +++++----
 mm/mm_init.h                                       |   1 +
 mm/mmap_lock.c                                     |  61 ++--
 mm/oom_kill.c                                      |  15 +-
 mm/page_alloc.c                                    |  32 +-
 mm/page_counter.c                                  |  20 ++
 mm/page_io.c                                       |  38 +-
 mm/page_isolation.c                                |  40 ++-
 mm/page_owner.c                                    |   6 +-
 mm/page_table_check.c                              |   6 +-
 mm/page_vma_mapped.c                               |   7 +
 mm/pagewalk.c                                      |   2 -
 mm/percpu.c                                        |   9 +-
 mm/pgtable-generic.c                               |  20 +-
 mm/rmap.c                                          |   9 +-
 mm/secretmem.c                                     |   6 +-
 mm/shmem.c                                         | 393 ++++++++++++++++-----
 mm/slab_common.c                                   |   2 +-
 mm/slub.c                                          |   7 +-
 mm/sparse-vmemmap.c                                | 224 ++++++------
 mm/sparse.c                                        |  94 +----
 mm/sparse.h                                        |  85 +++++
 mm/swap.h                                          |   3 +-
 mm/swap_state.c                                    |   4 +-
 mm/swapfile.c                                      |  43 ++-
 mm/userfaultfd.c                                   |  65 +---
 mm/vma.c                                           |  39 +-
 mm/vma.h                                           |   3 -
 mm/vmalloc.c                                       |  48 ++-
 mm/vmalloc.h                                       |   2 +-
 mm/vmpressure.c                                    |   3 -
 mm/vmscan.c                                        | 336 ++++++++++--------
 mm/vmstat.c                                        |  17 +-
 mm/zswap.c                                         |  21 +-
 net/ipv4/tcp.c                                     |  31 +-
 rust/kernel/mm.rs                                  |  58 +--
 samples/damon/mtier.c                              |   8 +-
 samples/damon/prcl.c                               |   5 +-
 samples/damon/wsse.c                               |   5 +-
 scripts/gdb/linux/mm.py                            |  14 +-
 tools/include/linux/mm.h                           |   4 -
 tools/mm/page_owner_sort.c                         | 134 ++++++-
 tools/sched_ext/include/scx/common.bpf.h           |   2 -
 tools/testing/selftests/cgroup/test_zswap.c        |  13 +-
 tools/testing/selftests/damon/_damon_sysfs.py      | 161 ++++++++-
 .../selftests/damon/drgn_dump_damon_status.py      |  32 ++
 tools/testing/selftests/damon/sysfs.py             |  39 +-
 tools/testing/selftests/damon/sysfs.sh             |  28 ++
 tools/testing/selftests/mm/.gitignore              |   2 +
 tools/testing/selftests/mm/folio_split_race_test.c |   2 -
 tools/testing/selftests/mm/hugetlb-soft-offline.c  |  49 +--
 tools/testing/selftests/mm/khugepaged.c            |  22 +-
 tools/testing/selftests/mm/merge.c                 | 104 ++++++
 tools/testing/selftests/mm/mlock-random-test.c     |   1 -
 tools/testing/selftests/mm/mremap_test.c           |  44 ++-
 tools/testing/selftests/mm/pkey-helpers.h          |   7 -
 tools/testing/selftests/mm/pkey_sighandler_tests.c |   4 +-
 tools/testing/selftests/mm/split_huge_page_test.c  |   4 -
 tools/testing/selftests/mm/uffd-wp-mremap.c        |   2 +
 .../selftests/proc/proc-self-map-files-001.c       |   2 +-
 .../selftests/proc/proc-self-map-files-002.c       |   2 +-
 tools/testing/vma/include/dup.h                    |  15 +-
 tools/testing/vma/shared.c                         |   9 +
 tools/testing/vma/tests/mmap.c                     |  37 ++
 tools/testing/vma/vma_internal.h                   |   1 -
 216 files changed, 3719 insertions(+), 3055 deletions(-)
 rename drivers/char/mem.c => mm/char-mem.c (97%)
Merging mm-nonmm-stable/mm-nonmm-stable (0d9ff90a5422c Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
$ git merge -m Merge branch 'mm-nonmm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable
Already up to date.
Merging mm-nonmm-unstable/mm-nonmm-unstable (136ebbeb1c604 checkpatch: skip kernel specific checks for userspace)
$ git merge -m Merge branch 'mm-nonmm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-unstable/mm-nonmm-unstable
Auto-merging .mailmap
Auto-merging MAINTAINERS
Auto-merging arch/s390/Kconfig
Auto-merging drivers/usb/gadget/legacy/inode.c
Auto-merging fs/proc/base.c
Auto-merging init/main.c
Auto-merging kernel/fork.c
Merge made by the 'ort' strategy.
 .mailmap                                           |   2 +
 Documentation/admin-guide/sysctl/kernel.rst        |   5 +-
 MAINTAINERS                                        |   1 +
 arch/Kconfig                                       |   8 -
 arch/alpha/include/uapi/asm/setup.h                |   4 +
 arch/arc/include/asm/setup.h                       |   2 +-
 arch/arm/include/uapi/asm/setup.h                  |   6 +-
 arch/arm64/include/uapi/asm/setup.h                |   4 +
 arch/loongarch/include/uapi/asm/setup.h            |   4 +
 arch/m68k/include/uapi/asm/setup.h                 |   6 +-
 arch/microblaze/include/uapi/asm/setup.h           |   4 +
 arch/mips/include/uapi/asm/setup.h                 |   4 +
 arch/parisc/include/uapi/asm/setup.h               |   4 +
 arch/powerpc/include/uapi/asm/setup.h              |   4 +
 arch/riscv/include/uapi/asm/setup.h                |   4 +
 arch/s390/Kconfig                                  |   8 -
 arch/s390/kernel/traps.c                           |   7 +
 arch/sparc/include/uapi/asm/setup.h                |  10 +-
 arch/sparc/kernel/setup.c                          |   9 +
 arch/um/include/asm/setup.h                        |   2 +-
 arch/x86/include/asm/setup.h                       |   2 +-
 arch/xtensa/include/uapi/asm/setup.h               |   4 +
 drivers/infiniband/hw/hfi1/fault.c                 |   1 -
 drivers/media/v4l2-core/v4l2-vp9.c                 |  30 +--
 drivers/usb/gadget/legacy/inode.c                  |   4 +-
 fs/fat/fat.h                                       |   2 +-
 fs/fat/fatent.c                                    |  21 +-
 fs/fat/file.c                                      |   3 +-
 fs/fat/inode.c                                     |  23 +-
 fs/fat/misc.c                                      |   6 +-
 fs/ocfs2/alloc.c                                   |  27 +++
 fs/ocfs2/dir.c                                     |  55 +++++
 fs/ocfs2/dlmglue.c                                 |   4 +
 fs/ocfs2/inode.c                                   |  53 ++++-
 fs/ocfs2/journal.c                                 |   3 +-
 fs/ocfs2/journal.h                                 |   1 -
 fs/ocfs2/ocfs2.h                                   |  17 ++
 fs/ocfs2/refcounttree.c                            |  27 +++
 fs/ocfs2/suballoc.c                                | 235 +++++++++++++++++---
 fs/ocfs2/suballoc.h                                |   2 +-
 fs/ocfs2/super.c                                   |  32 ++-
 fs/ocfs2/xattr.c                                   | 194 +++++++++++++----
 fs/proc/base.c                                     |   8 +-
 fs/squashfs/fragment.c                             |   6 +-
 fs/squashfs/squashfs_fs.h                          |   2 +-
 include/linux/fault-inject.h                       |  10 +-
 include/linux/minmax.h                             |   6 +-
 include/linux/panic.h                              |   2 +
 include/uapi/asm-generic/setup.h                   |   4 +
 init/Kconfig                                       |  19 +-
 init/main.c                                        |   8 +-
 init/version.c                                     |  11 +-
 ipc/mqueue.c                                       |   7 +
 kernel/fork.c                                      |   3 +-
 kernel/gcov/fs.c                                   |   2 +-
 kernel/hung_task.c                                 |  55 ++++-
 kernel/panic.c                                     |  22 +-
 kernel/resource.c                                  |   2 +-
 kernel/taskstats.c                                 |  51 ++---
 lib/Kconfig                                        |  14 +-
 lib/Kconfig.debug                                  |  15 ++
 lib/decompress_unxz.c                              |  12 +-
 lib/dynamic_debug.c                                |  15 +-
 lib/fault-inject.c                                 |   7 +-
 lib/group_cpus.c                                   |  87 +++++++-
 lib/klist.c                                        |  16 +-
 lib/plist.c                                        |   7 +
 lib/raid/Kconfig                                   |   2 +
 lib/raid/raid6/x86/avx2.c                          |   6 +
 lib/raid/raid6/x86/avx512.c                        |   6 +
 lib/raid/raid6/x86/recov_avx2.c                    |   2 +
 lib/raid/raid6/x86/recov_avx512.c                  |   2 +
 lib/raid/xor/x86/xor-avx.c                         |   1 +
 lib/tests/Makefile                                 |   1 +
 lib/tests/errseq_kunit.c                           | 237 +++++++++++++++++++++
 scripts/checkpatch.pl                              |  24 ++-
 scripts/checkstack.pl                              |   6 +-
 tools/testing/selftests/core/unshare_test.c        |  19 +-
 .../filesystems/epoll/epoll_wakeup_test.c          |  32 ++-
 .../selftests/membarrier/membarrier_test_impl.h    |  17 +-
 tools/testing/selftests/uevent/uevent_filtering.c  |   8 -
 81 files changed, 1312 insertions(+), 286 deletions(-)
 create mode 100644 lib/tests/errseq_kunit.c
Merging kbuild/kbuild-for-next (51794b107d54b scripts/gcc-plugins: suppress recorded GCC switches for extmod builds)
$ git merge -m Merge branch 'kbuild-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild/kbuild-for-next
Auto-merging Makefile
Merge made by the 'ort' strategy.
 Makefile                                           |  5 ++++-
 scripts/Makefile.gcc-plugins                       |  4 ++++
 scripts/kconfig/symbol.c                           |  5 ++++-
 scripts/kconfig/tests/err_recursive_dep/Kconfig    | 24 ++++++++++++++++++++++
 .../tests/err_recursive_dep/expected_stderr        | 13 ++++++++++++
 scripts/mkcompile_h                                |  2 +-
 scripts/setlocalversion                            |  3 +--
 7 files changed, 51 insertions(+), 5 deletions(-)
Merging clang-format/clang-format (8f0b4cce4481f Linux 6.19-rc1)
$ 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 (02f6847e18227 perf evsel: Validate RAW sample before byte swapping)
$ git merge -m Merge branch 'perf-tools-next' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next
Merge made by the 'ort' strategy.
 tools/perf/Documentation/perf-annotate.txt      |   3 +
 tools/perf/Documentation/perf-record.txt        |   8 +-
 tools/perf/Documentation/perf-report.txt        |   6 +
 tools/perf/Documentation/perf-top.txt           |   6 +
 tools/perf/arch/x86/util/pmu.c                  | 216 ++++++++++++++-------
 tools/perf/builtin-annotate.c                   |   3 +
 tools/perf/builtin-report.c                     |   3 +
 tools/perf/builtin-top.c                        |   2 +
 tools/perf/builtin-trace.c                      | 248 ++++++++++++++++++------
 tools/perf/tests/sample-parsing.c               | 109 +++++++++++
 tools/perf/tests/shell/annotate_weight.sh       |  63 ++++++
 tools/perf/tests/shell/trace_ksym_beautifier.sh |  38 ++++
 tools/perf/trace/beauty/beauty.h                |   3 +
 tools/perf/ui/browsers/annotate.c               |  20 +-
 tools/perf/util/annotate.c                      | 121 ++++++++++--
 tools/perf/util/annotate.h                      |  44 ++++-
 tools/perf/util/evsel.c                         |  20 +-
 tools/perf/util/genelf_debug.c                  |  28 +--
 tools/perf/util/jitdump.c                       | 204 +++++++++++++++----
 tools/perf/util/symbol_conf.h                   |  13 +-
 20 files changed, 943 insertions(+), 215 deletions(-)
 create mode 100755 tools/perf/tests/shell/annotate_weight.sh
 create mode 100755 tools/perf/tests/shell/trace_ksym_beautifier.sh
Merging compiler-attributes/compiler-attributes (8f0b4cce4481f Linux 6.19-rc1)
$ 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/dma-mapping-for-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'dma-mapping-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next
Already up to date.
Merging asm-generic/master (adbbd9714f805 scripts: headers_install.sh: Remove config leak ignore machinery)
$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic asm-generic/master
Already up to date.
Merging alpha/alpha-next (d58041d2c63e0 MAINTAINERS: Add Magnus Lindholm as maintainer for alpha port)
$ git merge -m Merge branch 'alpha-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next
Already up to date.
Merging arm/for-next (1a89abc009cb5 Merge branches 'fixes' and 'misc' into for-linus)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next
Already up to date.
Merging arm64/for-next/core (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core
Already up to date.
Merging arm-perf/for-next/perf (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-next/perf' of https://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 (ae77d827fb0e6 soc: document merges)
$ git merge -m Merge branch 'for-next' of https://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-contents.txt | 175 +++++++++++++++++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
Merging amlogic/for-next (87e20720aaadf Merge branch 'v7.4/arm64-dt' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next
Merge made by the 'ort' strategy.
 .../boot/dts/amlogic/amlogic-t7-a311d2-an400.dts   |   2 +-
 .../dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts  | 113 ++++++++++++++++++++-
 arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi        |  44 ++++++--
 .../dts/amlogic/meson-g12b-odroid-go-ultra.dts     |   2 +-
 .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts      |   2 +-
 arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi        |   2 +-
 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi         |   2 +-
 7 files changed, 153 insertions(+), 14 deletions(-)
Merging asahi-soc/asahi-soc/for-next (9c0d8280aec91 Merge branch 'apple-soc/dt-7.4' into asahi-soc/for-next)
$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next
Merge made by the 'ort' strategy.
 Documentation/devicetree/bindings/arm/apple.yaml   |   21 +
 .../devicetree/bindings/arm/apple/apple,pmgr.yaml  |    1 +
 Documentation/devicetree/bindings/arm/cpus.yaml    |    2 +
 .../devicetree/bindings/i2c/apple,i2c.yaml         |    1 +
 .../bindings/interrupt-controller/apple,aic2.yaml  |    1 +
 .../devicetree/bindings/pinctrl/apple,pinctrl.yaml |    1 +
 .../bindings/power/apple,pmgr-pwrstate.yaml        |    1 +
 .../devicetree/bindings/pwm/apple,s5l-fpwm.yaml    |    1 +
 arch/arm64/Kconfig.platforms                       |    1 +
 arch/arm64/boot/dts/apple/Makefile                 |    6 +
 arch/arm64/boot/dts/apple/t6001.dtsi               |   11 +-
 arch/arm64/boot/dts/apple/t6002.dtsi               |   18 +-
 arch/arm64/boot/dts/apple/t600x-die0.dtsi          |    3 +-
 arch/arm64/boot/dts/apple/t600x-dieX.dtsi          |    2 +
 arch/arm64/boot/dts/apple/t600x-nvme.dtsi          |    2 +
 arch/arm64/boot/dts/apple/t6021.dtsi               |   10 +-
 arch/arm64/boot/dts/apple/t6022.dtsi               |   18 +-
 arch/arm64/boot/dts/apple/t602x-common.dtsi        |    2 +-
 arch/arm64/boot/dts/apple/t602x-die0.dtsi          |    2 +
 arch/arm64/boot/dts/apple/t602x-dieX.dtsi          |    2 +
 arch/arm64/boot/dts/apple/t602x-nvme.dtsi          |    2 +
 arch/arm64/boot/dts/apple/t6030.dtsi               |    2 +-
 arch/arm64/boot/dts/apple/t6031-die0.dtsi          |    2 +
 arch/arm64/boot/dts/apple/t6031-dieX.dtsi          |    2 +
 arch/arm64/boot/dts/apple/t6031.dtsi               |    9 +-
 arch/arm64/boot/dts/apple/t6032.dtsi               |   18 +-
 arch/arm64/boot/dts/apple/t8132-j604.dts           |   35 +
 arch/arm64/boot/dts/apple/t8132-j623.dts           |   18 +
 arch/arm64/boot/dts/apple/t8132-j624.dts           |   18 +
 arch/arm64/boot/dts/apple/t8132-j713.dts           |   35 +
 arch/arm64/boot/dts/apple/t8132-j715.dts           |   35 +
 arch/arm64/boot/dts/apple/t8132-j773g.dts          |   25 +
 arch/arm64/boot/dts/apple/t8132-jxxx.dtsi          |   48 +
 arch/arm64/boot/dts/apple/t8132-pmgr.dtsi          | 1130 ++++++++++++++++++++
 arch/arm64/boot/dts/apple/t8132.dtsi               |  467 ++++++++
 35 files changed, 1902 insertions(+), 50 deletions(-)
 create mode 100644 arch/arm64/boot/dts/apple/t8132-j604.dts
 create mode 100644 arch/arm64/boot/dts/apple/t8132-j623.dts
 create mode 100644 arch/arm64/boot/dts/apple/t8132-j624.dts
 create mode 100644 arch/arm64/boot/dts/apple/t8132-j713.dts
 create mode 100644 arch/arm64/boot/dts/apple/t8132-j715.dts
 create mode 100644 arch/arm64/boot/dts/apple/t8132-j773g.dts
 create mode 100644 arch/arm64/boot/dts/apple/t8132-jxxx.dtsi
 create mode 100644 arch/arm64/boot/dts/apple/t8132-pmgr.dtsi
 create mode 100644 arch/arm64/boot/dts/apple/t8132.dtsi
Merging at91/at91-next (d6e7bce8d4392 Merge branch 'microchip-dt64' into at91-next)
$ git merge -m Merge branch 'at91-next' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next
Merge made by the 'ort' strategy.
Merging bmc/for-next (cd7d1ef7d74ed Merge branches 'aspeed/drivers', 'aspeed/arm/dt', 'aspeed/fixes/drivers', 'aspeed/maintainers', 'nuvoton/arm/dt', 'nuvoton/arm/fixes' and 'nuvoton/arm64/dt' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git bmc/for-next
Merge made by the 'ort' strategy.
Merging broadcom/next (c0f2033a9ce4b Merge branch 'devicetree-arm64/next' into next)
$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next
Merge made by the 'ort' strategy.
 .../devicetree/bindings/arm/bcm/bcm2835.yaml       |   6 ++
 arch/arm/boot/dts/broadcom/bcm-ns.dtsi             |  13 +++
 .../dts/broadcom/bcm4708-linksys-ea6300-v1.dts     |   4 +
 .../boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts  |  18 ++++
 .../boot/dts/broadcom/bcm4709-linksys-ea9200.dts   |  62 +++++++++++
 .../boot/dts/broadcom/bcm4709-netgear-r8000.dts    |  12 +++
 .../boot/dts/broadcom/bcm47094-dlink-dir-890l.dts  |   6 +-
 .../dts/broadcom/bcm47094-linksys-panamera.dts     |   2 +-
 arch/arm/boot/dts/broadcom/bcm47189-tenda-ac9.dts  |  20 ++++
 arch/arm/boot/dts/broadcom/bcm53573.dtsi           |   9 +-
 arch/arm/boot/dts/broadcom/bcm7445.dtsi            |   2 +-
 arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts |   5 +
 .../boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi    |  41 +++++++
 arch/arm64/boot/dts/broadcom/bcm2712.dtsi          |  77 +++++++++++++
 arch/arm64/boot/dts/broadcom/rp1-common.dtsi       | 119 +++++++++++++++++++++
 15 files changed, 392 insertions(+), 4 deletions(-)
Merging cix/for-next (a0cffbd8878c5 Merge remote-tracking branch 'cix/dt' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git cix/for-next
Merge made by the 'ort' strategy.
Merging davinci/davinci/for-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'davinci/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next
Already up to date.
Merging drivers-memory/for-next (8676f8e6dc8da memory: emif: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers)
$ 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
Merge made by the 'ort' strategy.
 drivers/memory/brcmstb_dpfe.c   | 41 ++++++++++++++-----
 drivers/memory/emif.h           |  4 +-
 drivers/memory/renesas-rpc-if.c | 87 +++++++++++++++++------------------------
 3 files changed, 69 insertions(+), 63 deletions(-)
Merging fsl/soc_fsl (e14b8d3938809 bus: fsl-mc: drop unused assignment of acpi_device_id::driver_data)
$ git merge -m Merge branch 'soc_fsl' of https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git fsl/soc_fsl
Already up to date.
Merging imx-mxs/for-next (ff1bb9ccce43c Merge branches 'imx/dt', 'imx/dt64', 'imx/fixes' and 'imx/soc' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git imx-mxs/for-next
Merge made by the 'ort' strategy.
 Documentation/devicetree/bindings/arm/fsl.yaml     |  14 +-
 .../bindings/display/bridge/fsl,ldb.yaml           |  23 +-
 .../devicetree/bindings/display/fsl,lcdif.yaml     |   1 +
 .../bindings/soc/imx/fsl,imx-iomuxc-gpr.yaml       |  62 ++
 arch/arm/boot/dts/nxp/imx/Makefile                 |  22 +
 arch/arm/boot/dts/nxp/imx/e60k02.dtsi              |   8 +-
 arch/arm/boot/dts/nxp/imx/e70k02.dtsi              |   8 +-
 arch/arm/boot/dts/nxp/imx/imx6dl-mamoj.dts         |   2 +-
 arch/arm/boot/dts/nxp/imx/imx6dl-plym2m.dts        |   2 +-
 arch/arm/boot/dts/nxp/imx/imx6dl-prtvt7.dts        |   2 +-
 arch/arm/boot/dts/nxp/imx/imx6dl-victgo.dts        |   2 +-
 arch/arm/boot/dts/nxp/imx/imx6q-bosch-acc.dts      |   4 +-
 arch/arm/boot/dts/nxp/imx/imx6qdl-gw560x.dtsi      |  20 +-
 arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi    |   2 +-
 arch/arm/boot/dts/nxp/imx/imx6qdl-zii-rdu2.dtsi    |  10 +-
 arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi             |  10 +-
 arch/arm/boot/dts/nxp/imx/imx6sl-kobo-aura2.dts    |   8 +-
 .../boot/dts/nxp/imx/imx6sl-tolino-shine2hd.dts    |   8 +-
 arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts          |   2 +-
 arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi        |   2 +-
 ...nel-cap-touch-7inch-parallel-touch-adapter.dtso |  58 ++
 ...olibri-emmc-panel-cap-touch-7inch-parallel.dtso |  43 ++
 ...olibri-emmc-panel-res-touch-7inch-parallel.dtso |  32 +
 arch/arm/boot/dts/nxp/imx/imx7s-warp.dts           |   2 +-
 arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi             |  36 +-
 arch/arm/boot/dts/nxp/ls/ls1021a.dtsi              |  10 +-
 arch/arm/boot/dts/nxp/vf/Makefile                  |   2 +
 arch/arm/boot/dts/nxp/vf/vf-colibri-iris.dtsi      | 126 ++++
 arch/arm/boot/dts/nxp/vf/vf-colibri.dtsi           |  56 ++
 arch/arm/boot/dts/nxp/vf/vf500-colibri-iris.dts    |  14 +
 arch/arm/boot/dts/nxp/vf/vf500.dtsi                |   6 +
 arch/arm/boot/dts/nxp/vf/vf610-colibri-iris.dts    |  14 +
 arch/arm/boot/dts/nxp/vf/vf610.dtsi                |   3 +
 arch/arm/include/asm/linkage.h                     |  29 +
 arch/arm/mach-imx/hardware.h                       |   2 +-
 arch/arm/mach-imx/mach-imx6q.c                     |  30 -
 arch/arm/mach-imx/mxc.h                            |   2 +-
 arch/arm/mach-imx/pm-imx6.c                        |  26 +-
 arch/arm/mach-imx/suspend-imx6.S                   |   6 +-
 arch/arm64/boot/dts/freescale/Makefile             | 243 ++++++-
 arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi     |   2 +-
 arch/arm64/boot/dts/freescale/fsl-lx216x.dtsi      |  19 +-
 .../arm64/boot/dts/freescale/imx8-apalis-eval.dtsi |   6 +-
 .../boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi |   6 +-
 .../boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi |   6 +-
 .../arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi |  16 +-
 .../dts/freescale/imx8mm-beacon-baseboard.dtsi     |   2 +-
 .../imx8mm-data-modul-edm-sbc-overlay-cm4.dtso     |  56 ++
 ...odul-edm-sbc-overlay-edm-mod-imx8mm-common.dtsi |  59 ++
 ...-edm-sbc-overlay-edm-mod-imx8mm-fio1-audio.dtsi |  99 +++
 ...-edm-sbc-overlay-edm-mod-imx8mm-fio1-audio.dtso |  79 +++
 ...-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1.dtsi |  69 ++
 ...-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1.dtso |  59 ++
 ...-modul-edm-sbc-overlay-edm-mod-imx8mm-hdmi.dtsi |  94 +++
 ...-modul-edm-sbc-overlay-edm-mod-imx8mm-hdmi.dtso |  17 +
 ...edm-sbc-overlay-edm-mod-imx8mm-lvds-common.dtsi | 118 ++++
 ...l-edm-sbc-overlay-edm-mod-imx8mm-lvds-dual.dtsi |  32 +
 ...sbc-overlay-edm-mod-imx8mm-lvds-g070y2-l01.dtsi |  12 +
 ...sbc-overlay-edm-mod-imx8mm-lvds-g070y2-l01.dtso |   7 +
 ...bc-overlay-edm-mod-imx8mm-lvds-g101ice-l01.dtsi |  12 +
 ...bc-overlay-edm-mod-imx8mm-lvds-g101ice-l01.dtso |   7 +
 ...bc-overlay-edm-mod-imx8mm-lvds-g121xce-l01.dtsi |  12 +
 ...bc-overlay-edm-mod-imx8mm-lvds-g121xce-l01.dtso |   7 +
 ...bc-overlay-edm-mod-imx8mm-lvds-g156hce-l01.dtsi |  12 +
 ...bc-overlay-edm-mod-imx8mm-lvds-g156hce-l01.dtso |   7 +
 ...sbc-overlay-edm-mod-imx8mm-lvds-g215hvn011.dtsi |  12 +
 ...sbc-overlay-edm-mod-imx8mm-lvds-g215hvn011.dtso |   7 +
 ...c-overlay-edm-mod-imx8mm-lvds-mi0700a2t-30.dtsi |  12 +
 ...c-overlay-edm-mod-imx8mm-lvds-mi0700a2t-30.dtso |   7 +
 ...verlay-edm-mod-imx8mm-lvds-mi1010z1t-1cp11.dtsi |  12 +
 ...verlay-edm-mod-imx8mm-lvds-mi1010z1t-1cp11.dtso |   7 +
 ...edm-sbc-overlay-edm-mod-imx8mm-lvds-single.dtsi |  20 +
 ...-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds.dtsi |  22 +
 ...odul-edm-sbc-overlay-edm-sbc-imx8mm-rev900.dtso |  18 +
 ...imx8mm-data-modul-edm-sbc-overlay-lvds-3v3.dtsi |  19 +
 ...imx8mm-data-modul-edm-sbc-overlay-lvds-5v0.dtsi |  19 +
 ...mx8mm-data-modul-edm-sbc-overlay-lvds-dual.dtsi |  29 +
 ...data-modul-edm-sbc-overlay-lvds-g070y2-l01.dtsi |  31 +
 ...ata-modul-edm-sbc-overlay-lvds-g101ice-l01.dtsi |  31 +
 ...ata-modul-edm-sbc-overlay-lvds-g121xce-l01.dtsi |  31 +
 ...ata-modul-edm-sbc-overlay-lvds-g156hce-l01.dtsi |  31 +
 ...data-modul-edm-sbc-overlay-lvds-g215hvn011.dtsi |  30 +
 ...ta-modul-edm-sbc-overlay-lvds-mi0700a2t-30.dtsi |  31 +
 ...modul-edm-sbc-overlay-lvds-mi1010z1t-1cp11.dtsi |  31 +
 ...8mm-data-modul-edm-sbc-overlay-lvds-single.dtsi |  13 +
 .../dts/freescale/imx8mm-data-modul-edm-sbc.dts    |   8 +-
 .../freescale/imx8mn-vhip4-evalboard-common.dtsi   |   3 +-
 .../dts/freescale/imx8mn-vhip4-evalboard-v1.dts    |   8 +
 .../dts/freescale/imx8mn-vhip4-evalboard-v2.dts    |  28 +-
 .../imx8mn-vhip4-overlay-eeprom-1000.dtso          | 103 +++
 .../imx8mn-vhip4-overlay-eeprom-1100.dtso          | 103 +++
 .../imx8mn-vhip4-overlay-eeprom-2000.dtso          | 107 +++
 .../imx8mp-data-modul-edm-sbc-overlay-cm7.dtso     |  57 ++
 ...-edm-sbc-overlay-edm-mod-imx8mm-fio1-audio.dtso |  67 ++
 ...-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1.dtso |  46 ++
 ...-modul-edm-sbc-overlay-edm-mod-imx8mm-hdmi.dtso |  17 +
 ...sbc-overlay-edm-mod-imx8mm-lvds-g070y2-l01.dtso |   7 +
 ...bc-overlay-edm-mod-imx8mm-lvds-g101ice-l01.dtso |   7 +
 ...bc-overlay-edm-mod-imx8mm-lvds-g121xce-l01.dtso |   7 +
 ...bc-overlay-edm-mod-imx8mm-lvds-g156hce-l01.dtso |   7 +
 ...sbc-overlay-edm-mod-imx8mm-lvds-g215hvn011.dtso |  11 +
 ...c-overlay-edm-mod-imx8mm-lvds-mi0700a2t-30.dtso |   7 +
 ...verlay-edm-mod-imx8mm-lvds-mi1010z1t-1cp11.dtso |   7 +
 ...-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds.dtsi |  35 +
 ...sbc-overlay-edm-sbc-imx8mp-lvds-g070y2-l01.dtso |  24 +
 ...bc-overlay-edm-sbc-imx8mp-lvds-g101ice-l01.dtso |  24 +
 ...bc-overlay-edm-sbc-imx8mp-lvds-g121xce-l01.dtso |  24 +
 ...bc-overlay-edm-sbc-imx8mp-lvds-g156hce-l01.dtso |  32 +
 ...sbc-overlay-edm-sbc-imx8mp-lvds-g215hvn011.dtso |  36 +
 ...c-overlay-edm-sbc-imx8mp-lvds-mi0700a2t-30.dtso |  24 +
 ...verlay-edm-sbc-imx8mp-lvds-mi1010z1t-1cp11.dtso |  24 +
 ...edm-sbc-overlay-edm-sbc-imx8mp-lvds-rev900.dtso |  41 ++
 ...edm-sbc-overlay-edm-sbc-imx8mp-lvds-rev902.dtso |  14 +
 ...-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds.dtsi |  79 +++
 ...odul-edm-sbc-overlay-edm-sbc-imx8mp-rev900.dtso |  97 +++
 ...odul-edm-sbc-overlay-edm-sbc-imx8mp-rev902.dtso |  69 ++
 .../dts/freescale/imx8mp-data-modul-edm-sbc.dts    |  48 +-
 .../dts/freescale/imx8mp-icore-mx8mp-edimm2.2.dts  |   2 +-
 .../boot/dts/freescale/imx8mp-icore-mx8mp.dtsi     |   2 +-
 .../imx8mp-phyboard-pollux-peb-av-10.dtsi          |   5 +-
 .../imx8mp-phyboard-pollux-peb-wlbt-07.dtso        |  76 +++
 ...8mp-tqma8mpqs-mb-smarc-2-lvds0-tm070jvhg33.dtso |   2 +-
 ...8mp-tqma8mpqs-mb-smarc-2-lvds1-tm070jvhg33.dtso |   2 +-
 arch/arm64/boot/dts/freescale/imx8mp.dtsi          |   2 +-
 arch/arm64/boot/dts/freescale/imx8mq-evk.dts       |   6 +
 .../boot/dts/freescale/imx8mq-librem5-devkit.dts   |   4 +-
 arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi  |   4 +-
 arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts  |   2 +-
 .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi |  16 +-
 arch/arm64/boot/dts/freescale/imx8mq.dtsi          | 168 ++---
 arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi  |  38 ++
 .../boot/dts/freescale/imx8qm-var-som-symphony.dts |   2 +-
 arch/arm64/boot/dts/freescale/imx8qm-var-som.dtsi  |   6 +-
 .../freescale/imx91-9x9-qsb-tianma-tm050rdh03.dtso | 104 +++
 arch/arm64/boot/dts/freescale/imx91-9x9-qsb.dts    |  51 ++
 arch/arm64/boot/dts/freescale/imx91.dtsi           |  11 +
 .../dts/freescale/imx93-11x11-frdm-common.dtsi     | 680 +++++++++++++++++++
 arch/arm64/boot/dts/freescale/imx93-11x11-frdm.dts | 679 +------------------
 arch/arm64/boot/dts/freescale/imx93w-frdm.dts      |  23 +
 arch/arm64/boot/dts/freescale/imx94.dtsi           |   2 +-
 .../boot/dts/freescale/imx943-evk-sdwifi.dtso      |  25 +
 arch/arm64/boot/dts/freescale/imx943-evk.dts       |  55 +-
 arch/arm64/boot/dts/freescale/imx943.dtsi          |   2 +-
 arch/arm64/boot/dts/freescale/imx95-15x15-frdm.dts |  24 +-
 arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts  |  55 +-
 arch/arm64/boot/dts/freescale/imx95.dtsi           |  12 +-
 arch/arm64/boot/dts/freescale/imx952-frdm.dts      |   9 +
 arch/arm64/boot/dts/freescale/imx952-frdm.dtsi     | 726 +++++++++++++++++++++
 arch/arm64/boot/dts/freescale/imx952.dtsi          |   8 +-
 arch/arm64/boot/dts/freescale/s32g2.dtsi           |   2 +-
 arch/arm64/boot/dts/freescale/s32g3.dtsi           |   2 +-
 include/linux/micrel_phy.h                         |   5 -
 include/soc/imx/cpu.h                              |   2 +-
 153 files changed, 5155 insertions(+), 1010 deletions(-)
 create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-panel-cap-touch-7inch-parallel-touch-adapter.dtso
 create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-panel-cap-touch-7inch-parallel.dtso
 create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-panel-res-touch-7inch-parallel.dtso
 create mode 100644 arch/arm/boot/dts/nxp/vf/vf-colibri-iris.dtsi
 create mode 100644 arch/arm/boot/dts/nxp/vf/vf500-colibri-iris.dts
 create mode 100644 arch/arm/boot/dts/nxp/vf/vf610-colibri-iris.dts
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-cm4.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-common.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1-audio.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1-audio.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-hdmi.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-hdmi.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-common.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-dual.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g070y2-l01.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g070y2-l01.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g101ice-l01.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g101ice-l01.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g121xce-l01.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g121xce-l01.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g156hce-l01.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g156hce-l01.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g215hvn011.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g215hvn011.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-mi0700a2t-30.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-mi0700a2t-30.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-mi1010z1t-1cp11.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-mi1010z1t-1cp11.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-single.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-sbc-imx8mm-rev900.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-3v3.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-5v0.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-dual.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-g070y2-l01.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-g101ice-l01.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-g121xce-l01.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-g156hce-l01.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-g215hvn011.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-mi0700a2t-30.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-mi1010z1t-1cp11.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-single.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-vhip4-overlay-eeprom-1000.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-vhip4-overlay-eeprom-1100.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-vhip4-overlay-eeprom-2000.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-cm7.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1-audio.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-hdmi.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g070y2-l01.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g101ice-l01.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g121xce-l01.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g156hce-l01.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g215hvn011.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-mi0700a2t-30.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-mi1010z1t-1cp11.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-g070y2-l01.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-g101ice-l01.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-g121xce-l01.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-g156hce-l01.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-g215hvn011.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-mi0700a2t-30.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-mi1010z1t-1cp11.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-rev900.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-rev902.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-rev900.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-rev902.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-peb-wlbt-07.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx91-9x9-qsb-tianma-tm050rdh03.dtso
 create mode 100644 arch/arm64/boot/dts/freescale/imx93-11x11-frdm-common.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/imx93w-frdm.dts
 create mode 100644 arch/arm64/boot/dts/freescale/imx952-frdm.dts
 create mode 100644 arch/arm64/boot/dts/freescale/imx952-frdm.dtsi
Merging mediatek/for-next (f5be25e697e03 Merge branch 'v7.2-next/dts32' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next
Auto-merging drivers/soc/mediatek/mt8167-mmsys.h
CONFLICT (content): Merge conflict in drivers/soc/mediatek/mt8167-mmsys.h
Resolved 'drivers/soc/mediatek/mt8167-mmsys.h' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 91dc58ae84081] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git
$ git diff -M --stat --summary HEAD^..
 drivers/soc/mediatek/mt8167-mmsys.h | 5 -----
 1 file changed, 5 deletions(-)
$ git am -3 ../patches/0001-mediatek-Take-the-other-branch.patch
Applying: mediatek: Take the other branch
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/soc/mediatek/mt8167-mmsys.h
$ git add -A .
$ git commit -v -a --amend
warning: notes ref refs/notes/commits is invalid
[master b13b234675da2] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git
 Date: Mon Sep 7 13:25:08 2026 +0100
Merging mvebu/for-next (1dd243147c2fa ARM: dts: marvell: Replace spaces indentation with tabs)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next
Merge made by the 'ort' strategy.
 .../boot/dts/marvell/armada-385-clearfog-gtr.dtsi  |  2 +-
 arch/arm/boot/dts/marvell/armada-388-helios4.dts   | 23 +++++++++-------------
 arch/arm/boot/dts/marvell/armada-38x.dtsi          |  1 +
 arch/arm/boot/dts/marvell/armada-395-gp.dts        |  1 -
 arch/arm/boot/dts/marvell/armada-39x.dtsi          |  1 +
 arch/arm/boot/dts/marvell/dove.dtsi                | 22 ++++++++++-----------
 arch/arm/boot/dts/marvell/kirkwood-6282.dtsi       | 15 +++++++-------
 .../dts/marvell/kirkwood-guruplug-server-plus.dts  |  4 ++--
 arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi       |  4 ++--
 arch/arm/boot/dts/marvell/kirkwood-synology.dtsi   | 12 +++++------
 .../arm/boot/dts/marvell/orion5x-rd88f5182-nas.dts |  2 +-
 11 files changed, 41 insertions(+), 46 deletions(-)
Merging omap/for-next (e1743a4a9b0b1 Merge branch 'omap-for-v7.4/soc' into tmp/omap-next-20260831.110627)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next
Merge made by the 'ort' strategy.
 .../devicetree/bindings/input/omap-keypad.txt      | 28 ----------
 .../devicetree/bindings/input/ti,omap4-keypad.yaml | 63 +++++++++++++++++++++
 .../boot/dts/ti/omap/am335x-boneblack-hdmi.dtsi    |  2 +-
 arch/arm/boot/dts/ti/omap/am335x-shc.dts           |  4 --
 arch/arm/boot/dts/ti/omap/am437x-l4.dtsi           |  2 +-
 arch/arm/boot/dts/ti/omap/am57-pruss.dtsi          | 11 ++++
 arch/arm/boot/dts/ti/omap/am571x-idk.dts           | 65 +++++++++++++++++++++-
 arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts  |  2 +-
 .../boot/dts/ti/omap/am57xx-beagle-x15-common.dtsi |  2 +-
 arch/arm/boot/dts/ti/omap/am57xx-idk-common.dtsi   |  3 +-
 arch/arm/boot/dts/ti/omap/dra7-l4.dtsi             |  2 +-
 .../boot/dts/ti/omap/motorola-mapphone-common.dtsi |  8 +--
 .../dts/ti/omap/motorola-mapphone-mz607-mz617.dtsi |  2 +
 arch/arm/boot/dts/ti/omap/omap3-igep.dtsi          |  2 +-
 arch/arm/boot/dts/ti/omap/omap3-n9.dts             |  5 +-
 arch/arm/boot/dts/ti/omap/omap3-n900.dts           |  3 +-
 arch/arm/boot/dts/ti/omap/omap3-n950.dts           |  5 +-
 arch/arm/boot/dts/ti/omap/omap3-tao3530.dtsi       |  8 +--
 .../boot/dts/ti/omap/omap4-droid-bionic-xt875.dts  |  2 +
 arch/arm/boot/dts/ti/omap/omap4-droid4-xt894.dts   |  2 +
 arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts  |  2 +
 arch/arm/boot/dts/ti/omap/omap4-l4.dtsi            |  1 +
 .../dts/ti/omap/omap4-samsung-espresso-common.dtsi |  6 +-
 arch/arm/boot/dts/ti/omap/omap4-sdp.dts            |  2 +
 arch/arm/boot/dts/ti/omap/omap4.dtsi               |  6 +-
 arch/arm/boot/dts/ti/omap/omap5-l4.dtsi            |  1 +
 arch/arm/boot/dts/ti/omap/omap5.dtsi               |  2 +-
 arch/arm/configs/omap2plus_defconfig               |  3 +
 arch/arm/mach-omap2/control.h                      |  8 +--
 arch/arm/mach-omap2/soc.h                          |  4 +-
 arch/arm/mach-omap2/sram.h                         |  4 +-
 31 files changed, 193 insertions(+), 67 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/input/omap-keypad.txt
 create mode 100644 Documentation/devicetree/bindings/input/ti,omap4-keypad.yaml
Merging qcom/for-next (ba20122d4c311 Merge branches 'arm64-defconfig-for-7.4', 'arm64-fixes-for-7.3', 'arm64-for-7.4', 'clk-fixes-for-7.3', 'clk-for-7.4', 'drivers-fixes-for-7.3' and 'drivers-for-7.4' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next
Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml
Merge made by the 'ort' strategy.
 Documentation/devicetree/bindings/arm/cpus.yaml    |    1 +
 .../bindings/arm/qcom,coresight-ctcu.yaml          |    1 +
 Documentation/devicetree/bindings/arm/qcom.yaml    |    2 +
 .../devicetree/bindings/clock/qcom,hawi-gpucc.yaml |   80 +
 .../bindings/clock/qcom,kaanapali-gxclkctl.yaml    |   23 +-
 .../devicetree/bindings/clock/qcom,kuno-gcc.yaml   |   52 +
 .../bindings/clock/qcom,milos-camcc.yaml           |   39 +-
 .../bindings/clock/qcom,milos-videocc.yaml         |   29 +-
 .../devicetree/bindings/clock/qcom,rpmhcc.yaml     |    1 +
 .../devicetree/bindings/clock/qcom,sm6375-gcc.yaml |    9 +-
 .../devicetree/bindings/clock/qcom,sm7150-gcc.yaml |   53 -
 .../bindings/clock/qcom,sm8450-camcc.yaml          |    2 +
 .../bindings/clock/qcom,sm8450-gpucc.yaml          |    3 +
 .../bindings/clock/qcom,sm8450-videocc.yaml        |    2 +
 .../bindings/clock/qcom,sm8550-tcsr.yaml           |    1 -
 .../bindings/clock/qcom,x1e80100-tcsr.yaml         |  114 +
 .../devicetree/bindings/firmware/qcom,scm.yaml     |    1 +
 .../bindings/interconnect/qcom,msm8998-bwmon.yaml  |    1 +
 .../bindings/net/wireless/qcom,ath11k.yaml         |   16 +-
 arch/arm64/boot/dts/qcom/Makefile                  |   20 +
 arch/arm64/boot/dts/qcom/agatti.dtsi               |   76 +-
 arch/arm64/boot/dts/qcom/eliza-evk.dtsi            |  221 ++
 arch/arm64/boot/dts/qcom/eliza-mtp.dts             |    8 +
 arch/arm64/boot/dts/qcom/eliza.dtsi                |  697 ++++-
 arch/arm64/boot/dts/qcom/glymur-crd.dts            |    8 +
 arch/arm64/boot/dts/qcom/glymur-crd.dtsi           |    3 +-
 .../boot/dts/qcom/glymur-hp-elitebook-x-g2q.dts    |  940 +++++++
 arch/arm64/boot/dts/qcom/glymur.dtsi               |  385 ++-
 arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts         |  134 +-
 arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi        |   21 +
 .../qcom/hamoa-lenovo-ideacentre-mini-01q8x10.dts  |   21 +
 arch/arm64/boot/dts/qcom/hamoa.dtsi                |   21 +-
 arch/arm64/boot/dts/qcom/kodiak.dtsi               | 1413 +++++-----
 .../boot/dts/qcom/lemans-evk-ifp-mezzanine.dtso    |   12 +-
 arch/arm64/boot/dts/qcom/lemans-pmics.dtsi         |  116 +
 arch/arm64/boot/dts/qcom/mahua-crd.dts             |    5 +
 arch/arm64/boot/dts/qcom/mahua.dtsi                |   89 +
 arch/arm64/boot/dts/qcom/milos.dtsi                |   10 +
 arch/arm64/boot/dts/qcom/monaco-ac-evk.dts         |  938 +++++++
 .../boot/dts/qcom/monaco-evk-ifp-mezzanine.dtso    |   12 +-
 arch/arm64/boot/dts/qcom/monaco-pmics.dtsi         |   62 +
 arch/arm64/boot/dts/qcom/msm8917-xiaomi-riva.dts   |   35 +
 arch/arm64/boot/dts/qcom/purwa-iot-evk.dts         |  133 +-
 arch/arm64/boot/dts/qcom/purwa-iot-som.dtsi        |   21 +
 .../qcom/qcs6490-rb3gen2-industrial-mezzanine.dtso |   24 +-
 .../dts/qcom/qcs6490-rb3gen2-vision-mezzanine.dtso |   13 +-
 arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts       |   12 +-
 .../dts/qcom/qcs6490-thundercomm-minipc-g1iot.dts  |   12 +-
 .../qcs6490-thundercomm-rubikpi3-cam1-imx219.dtso  |  115 +
 .../qcs6490-thundercomm-rubikpi3-cam2-imx219.dtso  |  115 +
 .../boot/dts/qcom/qcs6490-thundercomm-rubikpi3.dts |   23 +
 arch/arm64/boot/dts/qcom/qcs8550-rb5gen2.dts       |   12 +-
 arch/arm64/boot/dts/qcom/sc8280xp-crd.dts          |    3 +
 .../boot/dts/qcom/sc8280xp-huawei-gaokun3.dts      |    3 +
 .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts     |   37 +
 .../boot/dts/qcom/sc8280xp-microsoft-arcata.dts    |    3 +
 .../boot/dts/qcom/sc8280xp-microsoft-blackrock.dts |    3 +
 arch/arm64/boot/dts/qcom/sc8280xp.dtsi             |  554 +++-
 arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi |   42 +
 arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi |   36 +-
 .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi |    1 -
 .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi     |    2 +
 arch/arm64/boot/dts/qcom/shikra-cqm-som.dtsi       |    1 -
 arch/arm64/boot/dts/qcom/shikra-evk.dtsi           |    8 +
 arch/arm64/boot/dts/qcom/shikra-iqs-som.dtsi       |    1 -
 arch/arm64/boot/dts/qcom/shikra.dtsi               | 1490 +++++++++-
 .../boot/dts/qcom/sm7325-nothing-spacewar.dts      |    2 +
 .../boot/dts/qcom/sm8650-ayaneo-pocket-s2.dts      |  232 +-
 arch/arm64/boot/dts/qcom/sm8750.dtsi               |   68 +
 arch/arm64/boot/dts/qcom/x1-asus-vivobook-s15.dtsi |   21 +
 arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi  |   21 +
 arch/arm64/boot/dts/qcom/x1-crd.dtsi               |   21 +
 arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi        |   21 +
 arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi   |   21 +
 arch/arm64/boot/dts/qcom/x1-microsoft-denali.dtsi  |   93 +-
 arch/arm64/boot/dts/qcom/x1e001de-devkit.dts       |   21 +
 .../dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi    |   21 +
 .../boot/dts/qcom/x1e80100-dell-xps13-9345.dts     |   21 +
 .../dts/qcom/x1e80100-honor-magicbook-art-14.dts   |   21 +
 .../boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts  |   21 +
 .../dts/qcom/x1e80100-medion-sprchrgd-14-s1.dts    |   21 +
 .../boot/dts/qcom/x1e80100-microsoft-romulus.dtsi  |   21 +
 arch/arm64/boot/dts/qcom/x1e80100-qcp.dts          |   21 +
 .../boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts |   21 +
 .../boot/dts/qcom/x1p42100-microsoft-sp12in.dts    |   21 +
 arch/arm64/configs/defconfig                       |    3 +
 drivers/clk/qcom/Kconfig                           |  144 +-
 drivers/clk/qcom/Makefile                          |    7 +
 drivers/clk/qcom/cambistmclkcc-eliza.c             |  464 +++
 drivers/clk/qcom/camcc-eliza.c                     | 2803 +++++++++++++++++++
 drivers/clk/qcom/camcc-nord.c                      | 2941 ++++++++++++++++++++
 drivers/clk/qcom/clk-alpha-pll.c                   |    9 +
 drivers/clk/qcom/clk-rpmh.c                        |   15 +
 drivers/clk/qcom/dispcc-sm8450.c                   |   40 +-
 drivers/clk/qcom/gcc-eliza.c                       |    6 +-
 drivers/clk/qcom/gcc-hawi.c                        |    6 +-
 drivers/clk/qcom/gcc-kaanapali.c                   |    6 +-
 drivers/clk/qcom/gcc-kuno.c                        | 1483 ++++++++++
 drivers/clk/qcom/gcc-msm8939.c                     |    4 +
 drivers/clk/qcom/gcc-qcs8300.c                     |  103 +
 drivers/clk/qcom/gpucc-eliza.c                     |  606 ++++
 drivers/clk/qcom/gpucc-glymur.c                    |    2 +-
 drivers/clk/qcom/gpucc-hawi.c                      |  477 ++++
 drivers/clk/qcom/gpucc-kaanapali.c                 |    2 +-
 drivers/clk/qcom/nwgcc-nord.c                      |    3 +
 drivers/clk/qcom/tcsrcc-x1e80100.c                 |  337 +--
 drivers/clk/qcom/videocc-eliza.c                   |  404 +++
 drivers/clk/qcom/videocc-glymur.c                  |   38 +
 drivers/firmware/qcom/qcom_scm.c                   |  166 +-
 drivers/soc/qcom/Kconfig                           |    1 -
 drivers/soc/qcom/apr.c                             |   75 +-
 drivers/soc/qcom/llcc-qcom.c                       |   60 +-
 drivers/soc/qcom/pmic_glink_altmode.c              |    4 +-
 drivers/soc/qcom/qcom-geni-se.c                    |   49 +-
 drivers/soc/qcom/qcom_aoss.c                       |    4 +-
 drivers/soc/qcom/rpmh-internal.h                   |   16 +-
 drivers/soc/qcom/rpmh-rsc.c                        |    4 +-
 drivers/soc/qcom/rpmh.c                            |   40 +-
 drivers/soc/qcom/smem_dramc.c                      |   81 +-
 drivers/soc/qcom/smp2p.c                           |   12 +-
 drivers/soc/qcom/smsm.c                            |   20 +-
 drivers/soc/qcom/socinfo.c                         |    1 +
 drivers/soc/qcom/ubwc_config.c                     |    9 +
 include/dt-bindings/arm/qcom,ids.h                 |    1 +
 .../dt-bindings/clock/qcom,eliza-cambistmclkcc.h   |   32 +
 include/dt-bindings/clock/qcom,eliza-camcc.h       |  151 +
 include/dt-bindings/clock/qcom,eliza-gpucc.h       |   51 +
 include/dt-bindings/clock/qcom,eliza-videocc.h     |   37 +
 include/dt-bindings/clock/qcom,hawi-gpucc.h        |   47 +
 include/dt-bindings/clock/qcom,kuno-gcc.h          |  100 +
 include/dt-bindings/clock/qcom,nord-camcc.h        |  167 ++
 include/dt-bindings/clock/qcom,nord-nwgcc.h        |    3 +
 include/dt-bindings/clock/qcom,qcs8300-gcc.h       |    6 +
 include/linux/device-id/apr.h                      |   21 -
 include/linux/firmware/qcom/qcom_scm.h             |   29 -
 include/linux/mod_devicetable.h                    |    1 -
 include/linux/soc/qcom/apr.h                       |    4 +-
 include/linux/soc/qcom/llcc-qcom.h                 |    4 +
 include/linux/soc/qcom/ubwc.h                      |    3 +
 139 files changed, 18448 insertions(+), 1705 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/qcom,hawi-gpucc.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/qcom,kuno-gcc.yaml
 delete mode 100644 Documentation/devicetree/bindings/clock/qcom,sm7150-gcc.yaml
 create mode 100644 Documentation/devicetree/bindings/clock/qcom,x1e80100-tcsr.yaml
 create mode 100644 arch/arm64/boot/dts/qcom/glymur-hp-elitebook-x-g2q.dts
 create mode 100644 arch/arm64/boot/dts/qcom/monaco-ac-evk.dts
 create mode 100644 arch/arm64/boot/dts/qcom/qcs6490-thundercomm-rubikpi3-cam1-imx219.dtso
 create mode 100644 arch/arm64/boot/dts/qcom/qcs6490-thundercomm-rubikpi3-cam2-imx219.dtso
 create mode 100644 drivers/clk/qcom/cambistmclkcc-eliza.c
 create mode 100644 drivers/clk/qcom/camcc-eliza.c
 create mode 100644 drivers/clk/qcom/camcc-nord.c
 create mode 100644 drivers/clk/qcom/gcc-kuno.c
 create mode 100644 drivers/clk/qcom/gpucc-eliza.c
 create mode 100644 drivers/clk/qcom/gpucc-hawi.c
 create mode 100644 drivers/clk/qcom/videocc-eliza.c
 create mode 100644 include/dt-bindings/clock/qcom,eliza-cambistmclkcc.h
 create mode 100644 include/dt-bindings/clock/qcom,eliza-camcc.h
 create mode 100644 include/dt-bindings/clock/qcom,eliza-gpucc.h
 create mode 100644 include/dt-bindings/clock/qcom,eliza-videocc.h
 create mode 100644 include/dt-bindings/clock/qcom,hawi-gpucc.h
 create mode 100644 include/dt-bindings/clock/qcom,kuno-gcc.h
 create mode 100644 include/dt-bindings/clock/qcom,nord-camcc.h
 delete mode 100644 include/linux/device-id/apr.h
Merging realtek/for-next (3c778f0c9fa36 arm64: dts: realtek: Add GPIO support for RTD1625)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git realtek/for-next
Already up to date.
Merging renesas/next (c0ca80b66f226 Merge branch 'renesas-drivers-for-v7.4' into renesas-next)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next
Merge made by the 'ort' strategy.
 arch/arm/boot/dts/renesas/r7s72100-gr-peach.dts    |   2 +
 .../boot/dts/renesas/r8a7740-armadillo800eva.dts   |   2 +
 arch/arm/boot/dts/renesas/r8a7743-sk-rzg1m.dts     |   2 +
 arch/arm/boot/dts/renesas/r8a7743.dtsi             |   6 +-
 arch/arm/boot/dts/renesas/r8a7744.dtsi             |   6 +-
 arch/arm/boot/dts/renesas/r8a7745-sk-rzg1e.dts     |   2 +
 arch/arm/boot/dts/renesas/r8a7745.dtsi             |   6 +-
 arch/arm/boot/dts/renesas/r8a77470.dtsi            |   6 +-
 arch/arm/boot/dts/renesas/r8a7790-lager.dts        |  28 +-
 arch/arm/boot/dts/renesas/r8a7790-stout.dts        |   4 +-
 arch/arm/boot/dts/renesas/r8a7790.dtsi             |   4 +-
 arch/arm/boot/dts/renesas/r8a7791-koelsch.dts      |   2 +
 arch/arm/boot/dts/renesas/r8a7791-porter.dts       |   2 +
 arch/arm/boot/dts/renesas/r8a7791.dtsi             |   4 +-
 arch/arm/boot/dts/renesas/r8a7792.dtsi             |   4 +-
 arch/arm/boot/dts/renesas/r8a7793-gose.dts         |   2 +
 arch/arm/boot/dts/renesas/r8a7793.dtsi             |   4 +-
 arch/arm/boot/dts/renesas/r8a7794-alt.dts          |   2 +
 arch/arm/boot/dts/renesas/r8a7794-silk.dts         |   2 +
 arch/arm/boot/dts/renesas/r8a7794.dtsi             |   4 +-
 .../arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts |   1 -
 .../arm/boot/dts/renesas/r9a06g032-rzn1d400-eb.dts |  14 +-
 arch/arm/boot/dts/renesas/r9a06g032.dtsi           |   2 -
 arch/arm64/boot/dts/renesas/Makefile               |   6 +
 .../dts/renesas/aistarvision-mipi-adapter-2.1.dtsi |   2 +-
 .../boot/dts/renesas/beacon-renesom-baseboard.dtsi |   6 +-
 .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi |  12 +-
 arch/arm64/boot/dts/renesas/cat875.dtsi            |   2 +
 arch/arm64/boot/dts/renesas/condor-common.dtsi     |   2 +-
 arch/arm64/boot/dts/renesas/draak.dtsi             |   2 +-
 arch/arm64/boot/dts/renesas/ebisu.dtsi             |   6 +-
 arch/arm64/boot/dts/renesas/gray-hawk-single.dtsi  |   8 +-
 arch/arm64/boot/dts/renesas/hihope-common.dtsi     |   4 +-
 arch/arm64/boot/dts/renesas/hihope-rev2.dtsi       |   8 +-
 arch/arm64/boot/dts/renesas/hihope-rev4.dtsi       |   4 +-
 arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi    |   6 +-
 arch/arm64/boot/dts/renesas/r8a774a1.dtsi          |  14 +-
 arch/arm64/boot/dts/renesas/r8a774b1.dtsi          |  12 +-
 arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts    |   4 +-
 arch/arm64/boot/dts/renesas/r8a774c0.dtsi          |  12 +-
 arch/arm64/boot/dts/renesas/r8a774e1.dtsi          |  14 +-
 arch/arm64/boot/dts/renesas/r8a77951.dtsi          |  14 +-
 arch/arm64/boot/dts/renesas/r8a77960.dtsi          |  14 +-
 arch/arm64/boot/dts/renesas/r8a77961.dtsi          |  14 +-
 arch/arm64/boot/dts/renesas/r8a77965.dtsi          |  12 +-
 .../renesas/r8a77970-eagle-function-expansion.dtso |   2 +-
 arch/arm64/boot/dts/renesas/r8a77970-eagle.dts     |   2 +-
 arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts     |   2 +-
 arch/arm64/boot/dts/renesas/r8a77970.dtsi          |   2 +-
 arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts     |   2 +-
 arch/arm64/boot/dts/renesas/r8a77980.dtsi          |   4 +-
 arch/arm64/boot/dts/renesas/r8a77990.dtsi          |  10 +-
 arch/arm64/boot/dts/renesas/r8a77995.dtsi          |   6 +-
 .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi      |   2 +-
 arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts    |   4 +-
 arch/arm64/boot/dts/renesas/r8a779a0.dtsi          |   2 +-
 .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi      |   2 +-
 arch/arm64/boot/dts/renesas/r8a779f0.dtsi          |   2 +-
 arch/arm64/boot/dts/renesas/r8a779f4-s4sk.dts      |   2 +-
 arch/arm64/boot/dts/renesas/r8a779g0.dtsi          |  35 ++-
 .../renesas/r8a779g3-sparrow-hawk-fan-argon40.dtso |   1 -
 .../boot/dts/renesas/r8a779g3-sparrow-hawk.dts     |   2 +
 arch/arm64/boot/dts/renesas/r8a779h0.dtsi          |   2 +-
 arch/arm64/boot/dts/renesas/r8a779md-geist.dts     |  12 +-
 arch/arm64/boot/dts/renesas/r8a78000.dtsi          | 300 +++++++++++++++++++--
 .../arm64/boot/dts/renesas/r9a07g044l2-remi-pi.dts |   2 +-
 arch/arm64/boot/dts/renesas/r9a08g045.dtsi         |   5 +-
 arch/arm64/boot/dts/renesas/r9a08g046.dtsi         | 126 +++++++++
 arch/arm64/boot/dts/renesas/r9a09g011.dtsi         |   4 +-
 arch/arm64/boot/dts/renesas/r9a09g047.dtsi         |   2 +-
 arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts |   2 +
 arch/arm64/boot/dts/renesas/r9a09g056.dtsi         |   2 +-
 arch/arm64/boot/dts/renesas/r9a09g057.dtsi         |   2 +-
 .../boot/dts/renesas/r9a09g057h44-rzv2h-evk.dts    |   6 +-
 arch/arm64/boot/dts/renesas/r9a09g077.dtsi         |  61 ++++-
 .../dts/renesas/r9a09g077m44-evk-cn15-lcdc.dtso    |  53 ++++
 .../boot/dts/renesas/r9a09g077m44-rzt2h-evk.dts    |  18 +-
 arch/arm64/boot/dts/renesas/r9a09g087.dtsi         |  61 ++++-
 .../dts/renesas/r9a09g087m44-evk-cn20-lcdc.dtso    |  63 +++++
 .../boot/dts/renesas/r9a09g087m44-rzn2h-evk.dts    |  32 ++-
 .../boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi  |  16 +-
 arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi   |  20 +-
 arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi       |   2 +-
 .../boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi |  16 +-
 arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi  |  20 +-
 arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi      |   2 +-
 .../boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi |  16 +-
 arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi  |  20 +-
 arch/arm64/boot/dts/renesas/rzg3l-smarc-som.dtsi   |  14 +
 arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi   |  25 +-
 arch/arm64/boot/dts/renesas/rzg3s-smarc-switches.h |   4 +
 arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi       |   1 -
 .../boot/dts/renesas/rzt2h-n2h-evk-common.dtsi     |   7 +
 .../boot/dts/renesas/rzt2h-n2h-evk-du-adv7513.dtsi |  72 +++++
 arch/arm64/boot/dts/renesas/salvator-common.dtsi   |  14 +-
 arch/arm64/boot/dts/renesas/salvator-xs.dtsi       |   2 +-
 .../ulcb-kf-audio-graph-card2-mix+split.dtsi       |  18 +-
 arch/arm64/boot/dts/renesas/ulcb-kf.dtsi           |   2 +-
 arch/arm64/boot/dts/renesas/ulcb.dtsi              |   8 +-
 .../boot/dts/renesas/white-hawk-cpu-common.dtsi    |   6 +-
 drivers/soc/renesas/Kconfig                        |  19 +-
 drivers/soc/renesas/r9a08g046-sysc.c               |   1 +
 drivers/soc/renesas/rcar-mfis.c                    |  62 ++++-
 drivers/soc/renesas/rcar-rst.c                     |   1 +
 drivers/soc/renesas/renesas-soc.c                  |   3 +
 drivers/soc/renesas/rz-sysc.c                      |   5 +
 drivers/soc/renesas/rz-sysc.h                      |   2 +
 107 files changed, 1181 insertions(+), 321 deletions(-)
 create mode 100644 arch/arm64/boot/dts/renesas/r9a09g077m44-evk-cn15-lcdc.dtso
 create mode 100644 arch/arm64/boot/dts/renesas/r9a09g087m44-evk-cn20-lcdc.dtso
 create mode 100644 arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-du-adv7513.dtsi
Merging reset/reset/next (d373605cd5148 Merge tag 'reset-fixes-for-v7.0-2' into reset/next)
$ git merge -m Merge branch 'reset/next' of https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux reset/reset/next
Already up to date.
Merging rockchip/for-next (32e0f64640d55 Merge branch 'v7.4-armsoc/dts64' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next
Merge made by the 'ort' strategy.
 .../devicetree/bindings/arm/rockchip.yaml          |    7 +
 arch/arm/boot/dts/rockchip/rk3229-xms6.dts         |    4 +-
 arch/arm64/boot/dts/rockchip/Makefile              |    6 +
 .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi     |    2 +
 .../boot/dts/rockchip/rk3576-armsom-cm5-io.dts     |    4 +-
 arch/arm64/boot/dts/rockchip/rk3576.dtsi           |    2 +-
 arch/arm64/boot/dts/rockchip/rk3588-base.dtsi      |   39 +
 .../rockchip/rk3588-jaguar-can1-can2-uart4.dtso    |   26 +
 arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts     |   16 +
 .../boot/dts/rockchip/rk3588-lubancat-5-btb.dtsi   |  534 ++++++++++
 .../boot/dts/rockchip/rk3588-lubancat-5io.dts      | 1032 ++++++++++++++++++++
 .../boot/dts/rockchip/rk3588-nanopc-t6-lts.dts     |   17 -
 arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi |  175 ++--
 .../boot/dts/rockchip/rk3588-tiger-haikou.dts      |    4 +
 arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi     |    5 +
 .../boot/dts/rockchip/rk3588s-gameforce-ace.dts    |    7 +-
 16 files changed, 1755 insertions(+), 125 deletions(-)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-jaguar-can1-can2-uart4.dtso
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-lubancat-5-btb.dtsi
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-lubancat-5io.dts
Merging samsung-krzk/for-next (0d5119f276d7d Merge branches 'fixes' and 'next/clk' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next
Merge made by the 'ort' strategy.
 .../bindings/clock/samsung,exynos5515-cmu.yaml     |  145 ++
 .../bindings/hwinfo/samsung,exynos-chipid.yaml     |    1 +
 .../bindings/input/samsung,s3c6410-keypad.yaml     |   53 +-
 arch/arm/boot/dts/samsung/exynos4210-i9100.dts     |    5 +-
 arch/arm/boot/dts/samsung/exynos4412-midas.dtsi    |    5 +-
 arch/arm/mach-exynos/smc.h                         |    4 +-
 arch/arm/mach-s3c/Kconfig                          |    5 -
 arch/arm/mach-s3c/Kconfig.s3c64xx                  |    7 -
 arch/arm/mach-s3c/Makefile.s3c64xx                 |    1 -
 arch/arm/mach-s3c/devs.c                           |   27 -
 arch/arm/mach-s3c/devs.h                           |    1 -
 arch/arm/mach-s3c/gpio-core.h                      |    3 +
 arch/arm/mach-s3c/gpio-samsung-s3c64xx.h           |    5 +
 arch/arm/mach-s3c/gpio-samsung.c                   |   72 +-
 arch/arm/mach-s3c/keypad.h                         |   27 -
 arch/arm/mach-s3c/mach-crag6410.c                  |  135 +-
 arch/arm/mach-s3c/setup-keypad-s3c64xx.c           |   20 -
 drivers/clk/samsung/Makefile                       |    1 +
 drivers/clk/samsung/clk-exynos5515.c               | 1484 ++++++++++++++++++++
 drivers/clk/samsung/clk-pll.c                      |    1 +
 drivers/clk/samsung/clk-pll.h                      |    1 +
 drivers/input/keyboard/samsung-keypad.c            |  200 ++-
 drivers/soc/samsung/exynos-chipid.c                |    1 +
 include/dt-bindings/clock/samsung,exynos5515-cmu.h |  191 +++
 include/linux/input/samsung-keypad.h               |   39 -
 25 files changed, 2132 insertions(+), 302 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynos5515-cmu.yaml
 delete mode 100644 arch/arm/mach-s3c/keypad.h
 delete mode 100644 arch/arm/mach-s3c/setup-keypad-s3c64xx.c
 create mode 100644 drivers/clk/samsung/clk-exynos5515.c
 create mode 100644 include/dt-bindings/clock/samsung,exynos5515-cmu.h
 delete mode 100644 include/linux/input/samsung-keypad.h
Merging scmi/for-linux-next (fb4b90a22eed3 Merge branches 'for-next/ffa/fixes' and 'for-next/scmi/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux)
$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next
Auto-merging drivers/firmware/arm_scmi/driver.c
Merge made by the 'ort' strategy.
 drivers/clk/clk-scpi.c             | 11 ++++++++---
 drivers/firmware/arm_ffa/driver.c  |  1 +
 drivers/firmware/arm_scmi/driver.c |  2 +-
 drivers/firmware/arm_scpi.c        |  9 ++++++---
 4 files changed, 16 insertions(+), 7 deletions(-)
Merging sophgo/for-next (76acfee87c74d Merge branch 'dt/arm' into for-next)
$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next
Merge made by the 'ort' strategy.
Merging sophgo-soc/soc-for-next (c8754c7deab4c soc: sophgo: cv1800: rtcsys: New driver (handling RTC only))
$ git merge -m Merge branch 'soc-for-next' of https://github.com/sophgo/linux.git sophgo-soc/soc-for-next
Already up to date.
Merging spacemit/for-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/spacemit/linux spacemit/for-next
Already up to date.
Merging stm32/stm32-next (90d4d470d4d47 arm64: dts: st: Add I/O sync to eth1 pinctrl in stm32mp25-pinctrl.dtsi)
$ git merge -m Merge branch 'stm32-next' of https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next
Auto-merging arch/arm/boot/dts/st/stm32mp135f-dk.dts
Auto-merging arch/arm64/boot/dts/st/stm32mp257f-ev1.dts
Merge made by the 'ort' strategy.
 arch/arm/boot/dts/st/stm32mp131.dtsi               | 24 ++++++++++
 arch/arm/boot/dts/st/stm32mp135.dtsi               | 44 ++++++++---------
 arch/arm/boot/dts/st/stm32mp135f-dk.dts            | 16 ++++++-
 arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi        | 34 +++++++++++++
 arch/arm/boot/dts/st/stm32mp151.dtsi               | 20 ++++----
 .../arm/boot/dts/st/stm32mp153c-lxa-fairytux2.dtsi |  2 +-
 arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts      |  8 ++--
 arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts      |  8 ++--
 arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts      |  8 ++--
 arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts      |  8 ++--
 arch/arm/boot/dts/st/stm32mp157c-ev1.dts           |  8 ++--
 arch/arm/boot/dts/st/stm32mp157c-lxa-mc1.dts       |  2 +-
 arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi      |  2 +-
 arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi          | 34 +++++++++++--
 arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi      |  2 +
 arch/arm64/boot/dts/st/stm32mp257f-ev1.dts         | 56 +++++++++++-----------
 16 files changed, 187 insertions(+), 89 deletions(-)
Merging sunxi/sunxi/for-next (913f7eda9f3e3 ARM: dts: allwinner: sun7i-a20: Replace spaces indentation with tabs)
$ git merge -m Merge branch 'sunxi/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next
Merge made by the 'ort' strategy.
 arch/arm/boot/dts/allwinner/sun7i-a20.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging tee/next (a3067938fd192 Merge branches 'qcomtee_for_v7.3', 'optee_fix_for_v7.2' and 'jw-korg' into next)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git tee/next
Merge made by the 'ort' strategy.
Merging tegra/for-next (a53c665d36f61 Merge branch for-7.4/arm64/dt into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next
Merge made by the 'ort' strategy.
 .../memory-controllers/nvidia,tegra124-emc.yaml    | 10 ++-
 .../memory-controllers/nvidia,tegra124-mc.yaml     |  1 +
 arch/arm64/boot/dts/nvidia/tegra194.dtsi           |  4 +
 drivers/soc/tegra/pmc.c                            | 98 ++++++++++++++++++++++
 4 files changed, 110 insertions(+), 3 deletions(-)
Merging tenstorrent-dt/tenstorrent-dt-for-next (33583baeb1ba7 dt-bindings: iommu: riscv: Add bindings for Tenstorrent RISC-V IOMMU)
$ git merge -m Merge branch 'tenstorrent-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-dt/tenstorrent-dt-for-next
Already up to date.
Merging fustini-config/riscv-config-for-next (020e209272bee riscv: defconfig: thead: enable PCA953X GPIO driver)
$ git merge -m Merge branch 'riscv-config-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git fustini-config/riscv-config-for-next
Already up to date.
Merging thead-dt/thead-dt-for-next (15d32aaf6300b riscv: dts: thead: Add remaining Lichee Pi 4A IO expansions)
$ git merge -m Merge branch 'thead-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt/thead-dt-for-next
Already up to date.
Merging ti/ti-next (b1368ab37a986 Merge branches 'ti-drivers-soc-next' and 'ti-keystone-dts-next' into ti-next)
$ git merge -m Merge branch 'ti-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next
Auto-merging MAINTAINERS
Auto-merging drivers/firmware/ti_sci.c
Merge made by the 'ort' strategy.
 MAINTAINERS                                      |  1 +
 arch/arm/boot/dts/ti/keystone/keystone-k2e.dtsi  |  2 +-
 arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi  |  4 ++--
 arch/arm/boot/dts/ti/keystone/keystone-k2hk.dtsi | 16 ++++++++--------
 arch/arm/boot/dts/ti/keystone/keystone-k2l.dtsi  | 16 ++++++++--------
 arch/arm/boot/dts/ti/keystone/keystone.dtsi      |  4 ++--
 drivers/firmware/ti_sci.c                        |  4 ++--
 7 files changed, 24 insertions(+), 23 deletions(-)
Merging xilinx/for-next (20df11b6d0666 ARM: dts: xilinx: Replace spaces indentation with tabs)
$ git merge -m Merge branch 'for-next' of https://github.com/Xilinx/linux-xlnx.git xilinx/for-next
Merge made by the 'ort' strategy.
 arch/arm/boot/dts/xilinx/zynq-7000.dtsi      | 8 ++++----
 arch/arm/boot/dts/xilinx/zynq-parallella.dts | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
Merging socfpga/for-next (cfe5a96b888f2 arm64: dts: socfpga: change access permission from 755 to 644)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git socfpga/for-next
Merge made by the 'ort' strategy.
 arch/arm/mach-socfpga/Kconfig                               | 2 +-
 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dtsi     | 0
 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_emmc.dts | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dtsi
 mode change 100755 => 100644 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_emmc.dts
Merging clk/clk-next (91b1b8d437abe clk: tests: Add Kunit testing for nexus nodes)
$ git merge -m Merge branch 'clk-next' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next
Auto-merging drivers/clk/clk-scpi.c
Auto-merging drivers/clk/samsung/clk-pll.c
Merge made by the 'ort' strategy.
 .../bindings/clock/clock-nexus-node.yaml           |  30 +++++
 drivers/clk/Kconfig                                |   1 +
 drivers/clk/Makefile                               |   3 +-
 drivers/clk/actions/owl-composite.h                |   1 -
 drivers/clk/actions/owl-fixed-factor.h             |   2 -
 drivers/clk/aspeed/clk-aspeed.c                    |   2 +-
 drivers/clk/aspeed/clk-ast2600.c                   |   2 +-
 drivers/clk/aspeed/clk-ast2700.c                   |   2 +-
 drivers/clk/at91/clk-audio-pll.c                   |   4 +-
 drivers/clk/at91/clk-h32mx.c                       |   2 +-
 drivers/clk/at91/clk-main.c                        |   2 +-
 drivers/clk/at91/clk-pll.c                         |   2 +-
 drivers/clk/at91/clk-plldiv.c                      |   2 +-
 drivers/clk/at91/clk-slow.c                        |   2 +-
 drivers/clk/at91/clk-smd.c                         |   2 +-
 drivers/clk/at91/clk-usb.c                         |   6 +-
 drivers/clk/at91/sckc.c                            |   2 +-
 drivers/clk/bcm/clk-iproc-armpll.c                 |   2 +-
 drivers/clk/bcm/clk-iproc-asiu.c                   |   2 +-
 drivers/clk/bcm/clk-iproc-pll.c                    |   2 +-
 drivers/clk/berlin/berlin2-avpll.c                 |   4 +-
 drivers/clk/berlin/berlin2-pll.c                   |   2 +-
 drivers/clk/clk-axi-clkgen.c                       |   2 +-
 drivers/clk/clk-cdce925.c                          |   2 +-
 drivers/clk/clk-conf.c                             |  12 +-
 drivers/clk/clk-cs2000-cp.c                        |   2 +-
 drivers/clk/clk-fractional-divider.c               |   2 +-
 drivers/clk/clk-gemini.c                           |   2 +-
 drivers/clk/clk-highbank.c                         |   2 +-
 drivers/clk/clk-lmk04832.c                         |   6 +-
 drivers/clk/clk-milbeaut.c                         |   4 +-
 drivers/clk/clk-nomadik.c                          |   4 +-
 drivers/clk/clk-npcm7xx.c                          |   2 +-
 drivers/clk/clk-pwm.c                              |   2 +-
 drivers/clk/clk-scpi.c                             |   2 +-
 drivers/clk/clk-si514.c                            |   2 +-
 drivers/clk/clk-si521xx.c                          |   8 +-
 drivers/clk/clk-si5341.c                           |   2 +-
 drivers/clk/clk-si544.c                            |   2 +-
 drivers/clk/clk-si570.c                            |   2 +-
 drivers/clk/clk-stm32f4.c                          |   4 +-
 drivers/clk/clk-stm32h7.c                          |   2 +-
 drivers/clk/clk-versaclock5.c                      |   8 +-
 drivers/clk/clk-vt8500.c                           |   4 +-
 drivers/clk/clk-xgene.c                            |   6 +-
 drivers/clk/clk.c                                  |  61 +++++----
 drivers/clk/clk.h                                  |   5 +-
 drivers/clk/clk_kunit_helpers.c                    |  31 +++++
 drivers/clk/clk_test.c                             | 139 +++++++++++++++++++++
 drivers/clk/clkdev.c                               |   4 +-
 drivers/clk/davinci/Kconfig                        |  10 ++
 drivers/clk/davinci/Makefile                       |   8 +-
 drivers/clk/davinci/da8xx-cfgchip.c                |   4 +-
 drivers/clk/davinci/pll.c                          |   2 +-
 drivers/clk/davinci/psc.c                          |   2 +-
 drivers/clk/hisilicon/clk-hi3559a.c                |   2 +-
 drivers/clk/hisilicon/clk-hi3620.c                 |   2 +-
 drivers/clk/hisilicon/clk-hi6220-stub.c            |   2 +-
 drivers/clk/hisilicon/clk-hisi-phase.c             |   2 +-
 drivers/clk/hisilicon/clk-hix5hd2.c                |   2 +-
 drivers/clk/hisilicon/clkdivider-hi6220.c          |   2 +-
 drivers/clk/hisilicon/clkgate-separated.c          |   2 +-
 drivers/clk/imx/clk-busy.c                         |   4 +-
 drivers/clk/imx/clk-cpu.c                          |   2 +-
 drivers/clk/imx/clk-divider-gate.c                 |   2 +-
 drivers/clk/imx/clk-fixup-div.c                    |   2 +-
 drivers/clk/imx/clk-fixup-mux.c                    |   2 +-
 drivers/clk/imx/clk-frac-pll.c                     |   2 +-
 drivers/clk/imx/clk-fracn-gppll.c                  |   2 +-
 drivers/clk/imx/clk-gate-93.c                      |   2 +-
 drivers/clk/imx/clk-gate-exclusive.c               |   2 +-
 drivers/clk/imx/clk-gate2.c                        |   2 +-
 drivers/clk/imx/clk-lpcg-scu.c                     |   2 +-
 drivers/clk/imx/clk-pfd.c                          |   2 +-
 drivers/clk/imx/clk-pfdv2.c                        |   2 +-
 drivers/clk/imx/clk-pll14xx.c                      |   2 +-
 drivers/clk/imx/clk-pllv1.c                        |   2 +-
 drivers/clk/imx/clk-pllv2.c                        |   2 +-
 drivers/clk/imx/clk-pllv3.c                        |   2 +-
 drivers/clk/imx/clk-pllv4.c                        |   2 +-
 drivers/clk/imx/clk-scu.c                          |   4 +-
 drivers/clk/imx/clk-sscg-pll.c                     |   2 +-
 drivers/clk/ingenic/cgu.c                          |   2 +-
 drivers/clk/keystone/gate.c                        |   2 +-
 drivers/clk/keystone/pll.c                         |   2 +-
 drivers/clk/keystone/syscon-clk.c                  |   2 +-
 drivers/clk/kunit_clk_parse_clkspec.dtso           |  31 +++++
 drivers/clk/mediatek/Kconfig                       |   1 +
 drivers/clk/mediatek/clk-cpumux.c                  |   2 +-
 drivers/clk/mmp/clk-apbc.c                         |   2 +-
 drivers/clk/mmp/clk-apmu.c                         |   2 +-
 drivers/clk/mmp/clk-frac.c                         |   2 +-
 drivers/clk/mmp/clk-gate.c                         |   2 +-
 drivers/clk/mmp/clk-mix.c                          |   2 +-
 drivers/clk/mmp/clk-pll.c                          |   2 +-
 drivers/clk/mstar/clk-msc313-mpll.c                |   2 +-
 drivers/clk/mvebu/ap-cpu-clk.c                     |   2 +-
 drivers/clk/mvebu/clk-corediv.c                    |   2 +-
 drivers/clk/mvebu/clk-cpu.c                        |   2 +-
 drivers/clk/mxs/clk-div.c                          |   2 +-
 drivers/clk/mxs/clk-frac.c                         |   2 +-
 drivers/clk/mxs/clk-pll.c                          |   2 +-
 drivers/clk/mxs/clk-ref.c                          |   2 +-
 drivers/clk/nxp/clk-lpc18xx-creg.c                 |   2 +-
 drivers/clk/pistachio/clk-pll.c                    |   2 +-
 drivers/clk/rockchip/clk-cpu.c                     |   2 +-
 drivers/clk/rockchip/clk-ddr.c                     |   2 +-
 drivers/clk/rockchip/clk-gate-grf.c                |   2 +-
 drivers/clk/rockchip/clk-inverter.c                |   2 +-
 drivers/clk/rockchip/clk-mmc-phase.c               |   2 +-
 drivers/clk/rockchip/clk-muxgrf.c                  |   2 +-
 drivers/clk/rockchip/clk-pll.c                     |   2 +-
 drivers/clk/rockchip/clk.c                         |   2 +-
 drivers/clk/samsung/clk-cpu.c                      |   2 +-
 drivers/clk/samsung/clk-exynos-clkout.c            |   8 +-
 drivers/clk/samsung/clk-pll.c                      |   2 +-
 drivers/clk/socfpga/clk-gate-a10.c                 |   2 +-
 drivers/clk/socfpga/clk-gate-s10.c                 |   6 +-
 drivers/clk/socfpga/clk-gate.c                     |   2 +-
 drivers/clk/socfpga/clk-periph-a10.c               |   2 +-
 drivers/clk/socfpga/clk-periph-s10.c               |   8 +-
 drivers/clk/socfpga/clk-periph.c                   |   2 +-
 drivers/clk/socfpga/clk-pll-a10.c                  |   2 +-
 drivers/clk/socfpga/clk-pll-s10.c                  |   8 +-
 drivers/clk/socfpga/clk-pll.c                      |   2 +-
 drivers/clk/spear/clk-aux-synth.c                  |   2 +-
 drivers/clk/spear/clk-frac-synth.c                 |   2 +-
 drivers/clk/spear/clk-gpt-synth.c                  |   2 +-
 drivers/clk/spear/clk-vco-pll.c                    |   2 +-
 drivers/clk/st/clk-flexgen.c                       |   2 +-
 drivers/clk/st/clkgen-fsyn.c                       |   4 +-
 drivers/clk/st/clkgen-pll.c                        |   2 +-
 drivers/clk/stm32/clk-stm32mp1.c                   |   4 +-
 drivers/clk/sunxi/clk-sun4i-tcon-ch1.c             |   2 +-
 drivers/clk/tegra/clk-audio-sync.c                 |   2 +-
 drivers/clk/tegra/clk-divider.c                    |   2 +-
 drivers/clk/tegra/clk-periph-fixed.c               |   2 +-
 drivers/clk/tegra/clk-periph-gate.c                |   2 +-
 drivers/clk/tegra/clk-periph.c                     |   2 +-
 drivers/clk/tegra/clk-pll-out.c                    |   2 +-
 drivers/clk/tegra/clk-pll.c                        |   2 +-
 drivers/clk/tegra/clk-sdmmc-mux.c                  |   2 +-
 drivers/clk/tegra/clk-super.c                      |   4 +-
 drivers/clk/tegra/clk-tegra-super-cclk.c           |   2 +-
 drivers/clk/tegra/clk-tegra124-emc.c               |   2 +-
 drivers/clk/tegra/clk-tegra20-emc.c                |   2 +-
 drivers/clk/tegra/clk-tegra210-emc.c               |   2 +-
 drivers/clk/uniphier/clk-uniphier-cpugear.c        |   2 +-
 drivers/clk/uniphier/clk-uniphier-fixed-factor.c   |   2 +-
 drivers/clk/uniphier/clk-uniphier-fixed-rate.c     |   2 +-
 drivers/clk/uniphier/clk-uniphier-gate.c           |   2 +-
 drivers/clk/uniphier/clk-uniphier-mux.c            |   2 +-
 drivers/clk/ux500/clk-prcc.c                       |   2 +-
 drivers/clk/ux500/clk-prcmu.c                      |   4 +-
 drivers/clk/ux500/clk-sysctrl.c                    |   2 +-
 drivers/clk/versatile/clk-icst.c                   |   2 +-
 drivers/clk/versatile/clk-sp810.c                  |   2 +-
 drivers/clk/versatile/clk-vexpress-osc.c           |   2 +-
 drivers/clk/x86/clk-pmc-atom.c                     |   2 +-
 drivers/clk/xilinx/clk-xlnx-clock-wizard.c         |  14 +--
 drivers/clk/xilinx/xlnx_vcu.c                      |   2 +-
 drivers/clk/zynqmp/clk-gate-zynqmp.c               |   2 +-
 drivers/clk/zynqmp/clk-mux-zynqmp.c                |   2 +-
 drivers/clk/zynqmp/divider.c                       |   2 +-
 drivers/clk/zynqmp/pll.c                           |   2 +-
 include/kunit/clk.h                                |   2 +
 include/linux/clk-provider.h                       |  22 +++-
 167 files changed, 507 insertions(+), 240 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/clock-nexus-node.yaml
 create mode 100644 drivers/clk/davinci/Kconfig
 create mode 100644 drivers/clk/kunit_clk_parse_clkspec.dtso
Merging clk-imx/for-next (39ec460b56b26 clk: imx95-blk-ctl: Fix REFCLK rise-fall mismatch on i.MX95)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next
Already up to date.
Merging clk-renesas/renesas-clk (edabbfb616a89 clk: renesas: rzv2h: Convert to clk_hw based provider API)
$ git merge -m Merge branch 'renesas-clk' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk
Merge made by the 'ort' strategy.
 drivers/clk/renesas/r9a06g032-clocks.c |   2 +-
 drivers/clk/renesas/r9a08g046-cpg.c    |  92 +++++-
 drivers/clk/renesas/rzg2l-cpg.c        | 554 ++++++++++++++++++++++++++++++++-
 drivers/clk/renesas/rzg2l-cpg.h        |  51 ++-
 drivers/clk/renesas/rzv2h-cpg.c        | 164 +++++-----
 5 files changed, 740 insertions(+), 123 deletions(-)
Merging thead-clk/thead-clk-for-next (b2ee00d0bf4cc clk: thead: allow COMPILE_TEST builds)
$ git merge -m Merge branch 'thead-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk/thead-clk-for-next
Already up to date.
Merging tenstorrent-clk/tenstorrent-clk-for-next (23c8ebc952849 clk: tenstorrent: Add Atlantis clock controller driver)
$ git merge -m Merge branch 'tenstorrent-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-clk/tenstorrent-clk-for-next
Already up to date.
Merging csky/linux-next (abb81e5ce7d99 csky: Fix a4/a5 restoration in syscall trace path)
$ git merge -m Merge branch 'linux-next' of https://github.com/c-sky/csky-linux.git csky/linux-next
Already up to date.
Merging loongarch/loongarch-next (a2628ce4ddb68 perf build: Add clang and rust target flags for LoongArch)
$ git merge -m Merge branch 'loongarch-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next
Already up to date.
Merging m68k/for-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next
Already up to date.
Merging m68knommu/for-next (55acca33e9e87 m68k: fix typo "eanble" in comment)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next
Merge made by the 'ort' strategy.
 arch/m68k/coldfire/reset.c       | 2 +-
 arch/m68k/include/asm/m53xxacr.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Merging microblaze/next (8518fd17ccef4 microblaze: prevent ptrace writes to MSR and pt_mode)
$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next
Merge made by the 'ort' strategy.
 arch/microblaze/include/asm/entry.h           |  13 +
 arch/microblaze/include/asm/processor.h       |   2 +-
 arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c |   2 +-
 arch/microblaze/kernel/cpu/cpuinfo-static.c   |   2 +-
 arch/microblaze/kernel/cpu/cpuinfo.c          |   1 +
 arch/microblaze/kernel/entry.S                | 348 ++++++++++++++------------
 arch/microblaze/kernel/hw_exception_handler.S |   5 +
 arch/microblaze/kernel/process.c              |   5 +-
 arch/microblaze/kernel/ptrace.c               |   3 +
 arch/microblaze/kernel/signal.c               |  26 ++
 arch/microblaze/kernel/syscalls/syscall.tbl   |   2 +-
 11 files changed, 239 insertions(+), 170 deletions(-)
Merging mips/mips-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'mips-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next
Already up to date.
Merging openrisc/for-next (6620f5e8c11c4 openrisc: drop unneeded semicolon)
$ git merge -m Merge branch 'for-next' of https://github.com/openrisc/linux.git openrisc/for-next
Already up to date.
Merging parisc-hd/for-next (8d3ae59288f1e Linux 7.2)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next
Already up to date.
Merging powerpc/next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next
Already up to date.
Merging risc-v/for-next (77ae27fd98f3b Merge tag 'printk-for-7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux)
$ git merge -m Merge branch 'for-next' of https://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 (82ab962ef6c2a Merge branch 'k230-basic' into riscv-dt-for-next)
$ git merge -m Merge branch 'riscv-dt-for-next' of https://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 (8cdeaa50eae8d Linux 7.2-rc2)
$ git merge -m Merge branch 'riscv-soc-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next
Already up to date.
Merging s390/for-next (11acf42968807 Merge branch 'fixes' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next
Merge made by the 'ort' strategy.
Merging sh/for-next (b0aa5e4b087b6 sh: Fix fallout from ZERO_PAGE consolidation)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next
Already up to date.
Merging sparc/for-next (5b2a3b1a98fb4 sparc: Remove remaining defconfig references to the pktcdvd driver)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next
Already up to date.
Merging uml/next (1590cf0329716 Linux 7.2-rc4)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next
Already up to date.
Merging xtensa/xtensa-for-next (615612acc7853 xtensa: fix typos in comments)
$ git merge -m Merge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next
Merge made by the 'ort' strategy.
 arch/xtensa/include/asm/atomic.h    | 13 -------------
 arch/xtensa/include/uapi/asm/mman.h |  2 +-
 arch/xtensa/kernel/entry.S          |  2 +-
 arch/xtensa/kernel/vectors.S        |  2 +-
 arch/xtensa/mm/init.c               |  2 +-
 5 files changed, 4 insertions(+), 17 deletions(-)
Merging fs-next (716de2e0ce445 Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git)
$ git merge -m Merge branch 'fs-next' of linux-next fs-next
Auto-merging MAINTAINERS
Auto-merging fs/fat/misc.c
Auto-merging fs/iomap/buffered-io.c
Auto-merging fs/ocfs2/journal.c
Auto-merging include/linux/sched.h
Auto-merging tools/testing/selftests/Makefile
CONFLICT (content): Merge conflict in tools/testing/selftests/Makefile
Resolved 'tools/testing/selftests/Makefile' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 86f73de842b5b] Merge branch 'fs-next' of linux-next
$ git diff -M --stat --summary HEAD^..
 Documentation/admin-guide/binfmt-misc.rst          |    3 +
 Documentation/filesystems/exfat.rst                |  117 ++
 Documentation/filesystems/index.rst                |    1 +
 Documentation/filesystems/proc.rst                 |    4 +
 Documentation/filesystems/smb/ksmbd.rst            |   14 +-
 MAINTAINERS                                        |    3 +-
 arch/powerpc/Kconfig                               |    1 -
 arch/powerpc/include/asm/elf.h                     |    6 -
 arch/powerpc/include/asm/spu.h                     |    3 -
 arch/powerpc/platforms/cell/Kconfig                |    1 -
 arch/powerpc/platforms/cell/spu_syscalls.c         |   20 -
 arch/powerpc/platforms/cell/spufs/Makefile         |    1 -
 arch/powerpc/platforms/cell/spufs/coredump.c       |  183 --
 arch/powerpc/platforms/cell/spufs/file.c           |  114 --
 arch/powerpc/platforms/cell/spufs/spufs.h          |   12 -
 arch/powerpc/platforms/cell/spufs/syscalls.c       |    4 -
 drivers/base/devtmpfs.c                            |  108 +-
 fs/9p/vfs_inode.c                                  |    3 +
 fs/9p/vfs_inode_dotl.c                             |    3 +
 fs/adfs/dir.c                                      |    2 +-
 fs/aio.c                                           |   11 +-
 fs/binfmt_elf.c                                    |   16 +-
 fs/binfmt_elf_fdpic.c                              |   12 +-
 fs/binfmt_misc.c                                   |   12 +-
 fs/bpf_fs_kfuncs.c                                 |    4 +-
 fs/btrfs/Kconfig                                   |    1 +
 fs/btrfs/bio.c                                     |  141 +-
 fs/btrfs/bio.h                                     |    5 +-
 fs/btrfs/block-group.c                             |   20 +-
 fs/btrfs/btrfs_inode.h                             |   12 +-
 fs/btrfs/dev-replace.c                             |   10 +-
 fs/btrfs/disk-io.c                                 |   27 +-
 fs/btrfs/extent-tree.c                             |   10 +
 fs/btrfs/extent_io.c                               |   64 +-
 fs/btrfs/extent_map.c                              |    8 +
 fs/btrfs/file-item.c                               |   19 +-
 fs/btrfs/fs.h                                      |    2 +-
 fs/btrfs/inode.c                                   |  114 +-
 fs/btrfs/ioctl.c                                   |    2 +-
 fs/btrfs/qgroup.c                                  |  126 +-
 fs/btrfs/qgroup.h                                  |   16 +-
 fs/btrfs/raid56.c                                  |   46 +-
 fs/btrfs/sysfs.c                                   |  129 +-
 fs/btrfs/tree-checker.c                            |   66 +-
 fs/btrfs/verity.c                                  |   31 +-
 fs/btrfs/volumes.c                                 |   39 +-
 fs/btrfs/volumes.h                                 |    1 +
 fs/btrfs/zoned.c                                   |    5 +
 fs/buffer.c                                        |   37 +-
 fs/ceph/file.c                                     |    3 +
 fs/configfs/dir.c                                  |    9 +
 fs/configfs/symlink.c                              |   24 +-
 fs/coredump.c                                      |  438 +++--
 fs/dlm/config.c                                    |   30 +-
 fs/dlm/dlm_internal.h                              |    5 +
 fs/dlm/lock.c                                      |   18 +-
 fs/dlm/lock.h                                      |    4 +-
 fs/dlm/lowcomms.c                                  |    1 +
 fs/dlm/midcomms.c                                  |    1 +
 fs/dlm/plock.c                                     |   14 +-
 fs/dlm/user.c                                      |   23 +
 fs/exfat/dir.c                                     |   49 +-
 fs/exfat/fatent.c                                  |   19 +-
 fs/exfat/iomap.c                                   |   28 +-
 fs/exfat/misc.c                                    |    2 +-
 fs/exfat/namei.c                                   |    3 +-
 fs/exfat/super.c                                   |   10 +-
 fs/ext2/Makefile                                   |    2 +
 fs/ext2/balloc.c                                   |    4 +
 fs/ext2/ext2.h                                     |   19 +-
 fs/ext2/inode.c                                    |    7 +
 fs/ext2/super.c                                    |   33 +-
 fs/ext2/xattr.c                                    |    2 +-
 fs/ext4/ext4_jbd2.c                                |    2 +-
 fs/ext4/mmp.c                                      |    2 +-
 fs/f2fs/checkpoint.c                               |   14 +-
 fs/f2fs/f2fs.h                                     |    8 +-
 fs/fat/misc.c                                      |    2 +-
 fs/fs-writeback.c                                  |    2 +-
 fs/fuse/dax.c                                      |    1 +
 fs/fuse/dir.c                                      |    3 +
 fs/fuse/file.c                                     |    7 +-
 fs/fuse/fuse_i.h                                   |    9 +
 fs/fuse/inode.c                                    |   28 +
 fs/fuse/ioctl.c                                    |    3 -
 fs/fuse/req.c                                      |    7 +-
 fs/gfs2/acl.c                                      |   11 +-
 fs/gfs2/aops.c                                     |   17 +-
 fs/gfs2/bmap.c                                     |   93 +-
 fs/gfs2/dentry.c                                   |    6 +-
 fs/gfs2/dir.c                                      |   61 +-
 fs/gfs2/export.c                                   |    7 +-
 fs/gfs2/file.c                                     |   72 +-
 fs/gfs2/glock.c                                    |   60 +-
 fs/gfs2/glops.c                                    |   13 +-
 fs/gfs2/incore.h                                   |    8 +-
 fs/gfs2/inode.c                                    |  125 +-
 fs/gfs2/lock_dlm.c                                 |    4 +-
 fs/gfs2/log.c                                      |    7 +-
 fs/gfs2/lops.c                                     |   22 +-
 fs/gfs2/meta_io.c                                  |    7 +-
 fs/gfs2/ops_fstype.c                               |   26 +-
 fs/gfs2/quota.c                                    |   54 +-
 fs/gfs2/recovery.c                                 |   19 +-
 fs/gfs2/rgrp.c                                     |  129 +-
 fs/gfs2/super.c                                    |   98 +-
 fs/gfs2/trace_gfs2.h                               |    6 +-
 fs/gfs2/util.c                                     |    8 +-
 fs/gfs2/xattr.c                                    |   69 +-
 fs/inode.c                                         |    2 +-
 fs/internal.h                                      |    1 +
 fs/iomap/buffered-io.c                             |    6 +-
 fs/jbd2/commit.c                                   |   22 +-
 fs/jbd2/journal.c                                  |   31 +-
 fs/jbd2/transaction.c                              |    2 +-
 fs/kernfs/dir.c                                    |   76 +-
 fs/kernfs/kernfs-internal.h                        |    9 +-
 fs/lockd/svc.c                                     |    1 -
 fs/lockd/trace.h                                   |    1 -
 fs/lockd/xdr.h                                     |    2 +-
 fs/namei.c                                         |  229 ++-
 fs/nfs/dir.c                                       |    6 +
 fs/nfs/nfs4file.c                                  |    1 +
 fs/nfs/super.c                                     |   25 -
 fs/nfs_common/nfs_ssc.c                            |  126 +-
 fs/nfsd/blocklayout.c                              |    1 +
 fs/nfsd/blocklayoutxdr.c                           |   11 +
 fs/nfsd/export.c                                   |    8 +-
 fs/nfsd/export.h                                   |    3 +-
 fs/nfsd/filecache.c                                |    1 +
 fs/nfsd/flexfilelayout.c                           |   24 +-
 fs/nfsd/flexfilelayoutxdr.c                        |    9 +-
 fs/nfsd/flexfilelayoutxdr.h                        |    8 +-
 fs/nfsd/localio.c                                  |   10 +-
 fs/nfsd/lockd.c                                    |    4 +-
 fs/nfsd/nfs2acl.c                                  |   47 +-
 fs/nfsd/nfs3acl.c                                  |    1 +
 fs/nfsd/nfs3proc.c                                 |   78 +-
 fs/nfsd/nfs3xdr.c                                  |    3 +
 fs/nfsd/nfs4acl.c                                  |    1 +
 fs/nfsd/nfs4callback.c                             |    8 +-
 fs/nfsd/nfs4ctl.h                                  |   83 +
 fs/nfsd/nfs4idmap.c                                |    1 +
 fs/nfsd/nfs4layouts.c                              |    1 +
 fs/nfsd/nfs4proc.c                                 |  435 +++--
 fs/nfsd/nfs4recover.c                              |    1 +
 fs/nfsd/nfs4state.c                                |  264 ++-
 fs/nfsd/nfs4xdr.c                                  |  132 +-
 fs/nfsd/nfscache.c                                 |    1 +
 fs/nfsd/nfsctl.c                                   |    2 +
 fs/nfsd/nfsd.h                                     |  236 +--
 fs/nfsd/nfserr.h                                   |  158 ++
 fs/nfsd/nfsfh.c                                    |   72 +-
 fs/nfsd/nfsfh.h                                    |   28 +-
 fs/nfsd/nfsproc.c                                  |   20 +-
 fs/nfsd/nfssvc.c                                   |    8 +
 fs/nfsd/nfsxdr.c                                   |    1 +
 fs/nfsd/state.h                                    |   44 +-
 fs/nfsd/vfs.c                                      |  298 ++-
 fs/nfsd/vfs.h                                      |   39 +-
 fs/nfsd/xdr3.h                                     |    2 +-
 fs/nfsd/xdr4.h                                     |  152 +-
 fs/nfsd/xdr4cb.h                                   |   20 +-
 fs/notify/fanotify/fanotify_user.c                 |    2 +-
 fs/ntfs/attrlist.c                                 |    4 +-
 fs/ntfs/collate.c                                  |    2 +-
 fs/ntfs/inode.c                                    |    5 +-
 fs/ntfs/reparse.c                                  |    2 +-
 fs/ocfs2/buffer_head_io.c                          |   12 +-
 fs/ocfs2/journal.c                                 |   25 +-
 fs/ocfs2/quota_local.c                             |    4 +
 fs/omfs/inode.c                                    |    4 +-
 fs/open.c                                          |   59 +-
 fs/smb/client/cifsacl.c                            |   44 +-
 fs/smb/client/cifssmb.c                            |   26 +-
 fs/smb/client/dfs_cache.c                          |   18 +-
 fs/smb/client/dir.c                                |    3 +
 fs/smb/client/file.c                               |   22 +-
 fs/smb/client/inode.c                              |   17 +-
 fs/smb/client/misc.c                               |   24 +-
 fs/smb/client/readdir.c                            |   17 +-
 fs/smb/client/reparse.c                            |   30 +-
 fs/smb/client/trace.h                              |    1 +
 fs/smb/client/transport.c                          |   13 +-
 fs/smb/server/Kconfig                              |    2 +
 fs/smb/server/Makefile                             |    1 +
 fs/smb/server/ksmbd_work.c                         |    3 -
 fs/smb/server/ksmbd_work.h                         |    5 +-
 fs/smb/server/smb2pdu.c                            |  384 +---
 fs/smb/server/smbacl.c                             |    2 +
 fs/smb/server/tests/Kconfig                        |   15 +
 fs/smb/server/tests/Makefile                       |    4 +
 fs/smb/server/tests/smbacl_kunit.c                 |  301 +++
 fs/smb/server/vfs.c                                |    2 +
 fs/smb/server/vfs_cache.c                          |   48 -
 fs/smb/server/vfs_cache.h                          |    6 -
 fs/udf/inode.c                                     |   52 +-
 fs/udf/misc.c                                      |   15 +-
 fs/udf/super.c                                     |    5 +-
 fs/vboxsf/dir.c                                    |    3 +
 fs/xfs/libxfs/xfs_btree_mem.c                      |    2 +
 fs/xfs/libxfs/xfs_btree_staging.c                  |    4 +-
 fs/xfs/libxfs/xfs_da_btree.c                       |    1 +
 fs/xfs/libxfs/xfs_defer.c                          |   18 +-
 fs/xfs/libxfs/xfs_exchmaps.c                       |   10 +
 fs/xfs/libxfs/xfs_parent.c                         |   12 +-
 fs/xfs/libxfs/xfs_rtrefcount_btree.c               |    7 +-
 fs/xfs/libxfs/xfs_rtrmap_btree.c                   |    6 +-
 fs/xfs/libxfs/xfs_trans_space.c                    |   19 +-
 fs/xfs/scrub/alloc_repair.c                        |   18 +-
 fs/xfs/scrub/dir_repair.c                          |   27 +-
 fs/xfs/scrub/dirtree.c                             |   31 +-
 fs/xfs/scrub/dirtree_repair.c                      |    1 +
 fs/xfs/scrub/ialloc.c                              |    4 +
 fs/xfs/scrub/metapath.c                            |   87 +-
 fs/xfs/scrub/quota_repair.c                        |   14 +-
 fs/xfs/scrub/quotacheck.c                          |    4 +-
 fs/xfs/scrub/reap.c                                |    6 +-
 fs/xfs/scrub/refcount.c                            |    8 +-
 fs/xfs/scrub/rgsuper.c                             |    6 +-
 fs/xfs/scrub/rtrefcount.c                          |   82 +-
 fs/xfs/scrub/rtsummary_repair.c                    |    3 +-
 fs/xfs/scrub/scrub.c                               |    3 +-
 fs/xfs/scrub/stats.c                               |   28 +-
 fs/xfs/scrub/stats.h                               |    4 +-
 fs/xfs/scrub/symlink_repair.c                      |    2 +-
 fs/xfs/scrub/trace.h                               |   35 +-
 fs/xfs/xfs_buf.c                                   |    4 +-
 fs/xfs/xfs_exchmaps_item.c                         |   19 +-
 fs/xfs/xfs_exchrange.c                             |   12 +-
 fs/xfs/xfs_extent_busy.c                           |    4 +-
 fs/xfs/xfs_healthmon.c                             |  130 +-
 fs/xfs/xfs_healthmon.h                             |    5 +-
 fs/xfs/xfs_icache.c                                |    3 +-
 fs/xfs/xfs_ioctl.c                                 |  381 ++--
 fs/xfs/xfs_ioctl.h                                 |    4 +-
 fs/xfs/xfs_ioctl32.c                               |  188 +-
 fs/xfs/xfs_log.c                                   |   33 +-
 fs/xfs/xfs_log_cil.c                               |    3 +-
 fs/xfs/xfs_log_priv.h                              |    4 +-
 fs/xfs/xfs_mru_cache.c                             |    2 +-
 fs/xfs/xfs_trace.h                                 |    4 +-
 fs/xfs/xfs_trans_ail.c                             |    4 +-
 fs/xfs/xfs_verify_media.c                          |   24 +-
 fs/xfs/xfs_zone_alloc.c                            |    2 +
 fs/xfs/xfs_zone_space_resv.c                       |    8 +-
 include/linux/binfmts.h                            |    3 +-
 include/linux/buffer_head.h                        |   36 +-
 include/linux/coredump.h                           |   37 +-
 include/linux/fcntl.h                              |    6 +
 include/linux/nfs.h                                |   55 +-
 include/linux/nfs3.h                               |    8 +
 include/linux/nfs4.h                               |    6 +
 include/linux/nfs_fh.h                             |   63 +
 include/linux/nfs_ssc.h                            |   69 +-
 include/linux/nfsd_ssc.h                           |   38 +
 include/linux/nfslocalio.h                         |   11 +-
 include/linux/sched.h                              |    2 +-
 include/linux/sched/signal.h                       |   27 +-
 include/trace/misc/nfs.h                           |    1 +
 include/uapi/linux/btrfs_tree.h                    |   21 +-
 include/uapi/linux/coredump.h                      |  149 +-
 include/uapi/linux/fuse.h                          |   12 +-
 kernel/pid_namespace.c                             |    3 +-
 kernel/user_namespace.c                            |    3 -
 mm/shmem_quota.c                                   |    5 +
 net/sunrpc/svcsock.c                               |   83 +-
 net/sunrpc/xprtsock.c                              |   66 +-
 tools/include/uapi/linux/coredump.h                |  149 +-
 tools/testing/selftests/Makefile                   |    1 +
 tools/testing/selftests/coredump/Makefile          |    7 +-
 .../selftests/coredump/coredump_notify_signal.h    |   29 +
 .../coredump/coredump_notify_signal_helper.c       |   46 +
 .../coredump/coredump_notify_signal_test.c         |  245 +++
 .../coredump/coredump_socket_protocol_test.c       | 1983 +++++++++++++++-----
 tools/testing/selftests/coredump/coredump_test.h   |   32 +-
 .../selftests/coredump/coredump_test_helpers.c     | 1742 ++++++++++++++++-
 .../selftests/coredump/coredump_test_helpers.h     |   79 +
 tools/testing/selftests/exec/Makefile              |    4 +
 tools/testing/selftests/exec/binfmt_misc_delim.c   |  127 ++
 tools/testing/selftests/filesystems/.gitignore     |    2 +-
 tools/testing/selftests/filesystems/Makefile       |    2 +-
 .../selftests/filesystems/file_stressor/.gitignore |    2 +
 .../selftests/filesystems/file_stressor/Makefile   |    6 +
 .../{ => file_stressor}/file_stressor.c            |    0
 .../selftests/filesystems/file_stressor/settings   |    3 +
 .../selftests/filesystems/fscontext_ns/.gitignore  |    2 +
 .../testing/selftests/filesystems/fuse/.gitignore  |    1 +
 tools/testing/selftests/filesystems/fuse/Makefile  |    2 +-
 tools/testing/selftests/filesystems/kernfs_test.c  |   16 +-
 .../selftests/filesystems/open_o_creat_o_dir.c     |  201 ++
 tools/testing/selftests/filesystems/wrappers.h     |   11 +
 292 files changed, 9767 insertions(+), 4189 deletions(-)
 create mode 100644 Documentation/filesystems/exfat.rst
 delete mode 100644 arch/powerpc/platforms/cell/spufs/coredump.c
 create mode 100644 fs/nfsd/nfs4ctl.h
 create mode 100644 fs/nfsd/nfserr.h
 create mode 100644 fs/smb/server/tests/Kconfig
 create mode 100644 fs/smb/server/tests/Makefile
 create mode 100644 fs/smb/server/tests/smbacl_kunit.c
 create mode 100644 include/linux/nfs_fh.h
 create mode 100644 include/linux/nfsd_ssc.h
 create mode 100644 tools/testing/selftests/coredump/coredump_notify_signal.h
 create mode 100644 tools/testing/selftests/coredump/coredump_notify_signal_helper.c
 create mode 100644 tools/testing/selftests/coredump/coredump_notify_signal_test.c
 create mode 100644 tools/testing/selftests/coredump/coredump_test_helpers.h
 create mode 100644 tools/testing/selftests/exec/binfmt_misc_delim.c
 create mode 100644 tools/testing/selftests/filesystems/file_stressor/.gitignore
 create mode 100644 tools/testing/selftests/filesystems/file_stressor/Makefile
 rename tools/testing/selftests/filesystems/{ => file_stressor}/file_stressor.c (100%)
 create mode 100644 tools/testing/selftests/filesystems/file_stressor/settings
 create mode 100644 tools/testing/selftests/filesystems/fscontext_ns/.gitignore
 create mode 100644 tools/testing/selftests/filesystems/open_o_creat_o_dir.c
Merging printk/for-next (45b895e5f6ce6 Merge branch 'for-7.4-console-registration' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next
Merge made by the 'ort' strategy.
 include/linux/console.h |  2 +-
 kernel/printk/nbcon.c   |  6 ++++--
 kernel/printk/printk.c  | 39 +++++++++++++++++++++++++++------------
 3 files changed, 32 insertions(+), 15 deletions(-)
Merging pci/next (39ee38a9fa2ea Merge branch 'pci/controller/dwc-rcar-gen4')
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next
Merge made by the 'ort' strategy.
 .../pci/controller/cadence/pcie-cadence-debugfs.c  | 15 ++---
 drivers/pci/controller/dwc/pcie-designware-ep.c    |  8 ++-
 drivers/pci/controller/dwc/pcie-designware.h       |  1 +
 drivers/pci/controller/dwc/pcie-rcar-gen4.c        | 68 ++++++++++++++++++++--
 drivers/pci/controller/pcie-aspeed.c               |  9 ++-
 5 files changed, 83 insertions(+), 18 deletions(-)
Merging pstore/for-next/pstore (24b8f8dcb9a13 pstore/ftrace: Factor KASLR offset in the core kernel instruction addresses)
$ git merge -m Merge branch 'for-next/pstore' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore
Already up to date.
Merging hid/for-next (8dd52b64d0822 Merge branch 'for-7.3/upstream-fixes' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next
Merge made by the 'ort' strategy.
Merging i2c/i2c/for-next (8cd9520d35a6c Linux 7.1)
$ git merge -m Merge branch 'i2c/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next
Already up to date.
$ git am -3 ../patches/0001-i2c-Fix-up-the-rest-of-the-merge.patch
Applying: i2c: Fix up the rest of the merge
Using index info to reconstruct a base tree...
M	drivers/i2c/i2c-core-base.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/i2c/i2c-core-base.c
No changes -- Patch already applied.
Merging i2c-andi/i2c/i2c-next (1f3e66348d252 Merge branch 'i2c/i2c' into i2c/i2c-next)
$ git merge -m Merge branch 'i2c/i2c-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-andi/i2c/i2c-next
Merge made by the 'ort' strategy.
 Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 2 +-
 drivers/i2c/busses/i2c-bcm2835.c                               | 2 +-
 drivers/i2c/busses/i2c-qcom-geni.c                             | 3 +--
 drivers/i2c/i2c-core-acpi.c                                    | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)
Merging i2c-rust/rust-i2c-next (61ddec70c9bcc i2c: rust: mark I2cAdapter methods as inline)
$ git merge -m Merge branch 'rust-i2c-next' of https://github.com/ikrtn/rust-for-linux i2c-rust/rust-i2c-next
Already up to date.
Merging i3c/i3c/next (cab40cfc9e116 i3c: dw: reduce do_daa time if there's no client)
$ git merge -m Merge branch 'i3c/next' of https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next
Already up to date.
Merging dmi/dmi-for-next (1afafbaf749d8 firmware/dmi: Include product_family info to modalias)
$ git merge -m Merge branch 'dmi-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next
Already up to date.
Merging hwmon-staging/hwmon-next (ba08432bda66a hwmon: (pmbus/tps53679) Add support for TPS53622 and TPS53659)
$ git merge -m Merge branch 'hwmon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 Documentation/ABI/testing/sysfs-class-hwmon        |  36 ++
 .../devicetree/bindings/hwmon/national,lm90.yaml   |  28 +-
 .../bindings/hwmon/pmbus/ti,tps25990.yaml          |   8 +-
 .../devicetree/bindings/hwmon/ti,tmp102.yaml       |  16 +-
 .../devicetree/bindings/trivial-devices.yaml       |   8 +-
 Documentation/hwmon/asus_ec_sensors.rst            |   1 +
 Documentation/hwmon/honor-fmi.rst                  |  32 ++
 Documentation/hwmon/index.rst                      |   2 +
 Documentation/hwmon/it87.rst                       |   8 +
 Documentation/hwmon/minisforum-um780xtx.rst        |  68 +++
 Documentation/hwmon/sht4x.rst                      |  17 +-
 Documentation/hwmon/sysfs-interface.rst            |  12 +
 Documentation/hwmon/tps25990.rst                   |  15 +-
 Documentation/hwmon/tps53679.rst                   |  24 +-
 Documentation/hwmon/yogafan.rst                    |   3 +-
 MAINTAINERS                                        |  14 +
 drivers/hwmon/Kconfig                              |  26 ++
 drivers/hwmon/Makefile                             |   2 +
 drivers/hwmon/asus-ec-sensors.c                    |   2 +
 drivers/hwmon/dell-smm-hwmon.c                     |  16 +
 drivers/hwmon/honor-fmi.c                          | 178 ++++++++
 drivers/hwmon/hwmon.c                              |   6 +
 drivers/hwmon/it87.c                               | 308 ++++++++++---
 drivers/hwmon/lm90.c                               |   5 +
 drivers/hwmon/minisforum-um780xtx.c                | 501 +++++++++++++++++++++
 drivers/hwmon/pmbus/Kconfig                        |   5 +-
 drivers/hwmon/pmbus/tps25990.c                     | 249 +++++++---
 drivers/hwmon/pmbus/tps53679.c                     |   9 +-
 drivers/hwmon/sht4x.c                              |  62 ++-
 drivers/hwmon/spd5118.c                            |  67 +--
 drivers/hwmon/yogafan.c                            |  19 +
 include/linux/hwmon.h                              |  12 +
 32 files changed, 1567 insertions(+), 192 deletions(-)
 create mode 100644 Documentation/hwmon/honor-fmi.rst
 create mode 100644 Documentation/hwmon/minisforum-um780xtx.rst
 create mode 100644 drivers/hwmon/honor-fmi.c
 create mode 100644 drivers/hwmon/minisforum-um780xtx.c
Merging jc_docs/docs-next (ab2704c2a8840 docs: sysctl: timer_migration is for hrtimer only)
$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
Auto-merging Documentation/admin-guide/sysctl/kernel.rst
Auto-merging Documentation/filesystems/proc.rst
Merge made by the 'ort' strategy.
 Documentation/admin-guide/parport.rst              |  2 +-
 Documentation/admin-guide/sysctl/kernel.rst        |  6 ++--
 Documentation/core-api/cpu_hotplug.rst             |  4 +--
 Documentation/core-api/debug-objects.rst           |  2 +-
 Documentation/core-api/dma-attributes.rst          |  2 +-
 Documentation/core-api/irq/irq-affinity.rst        |  2 +-
 Documentation/core-api/real-time/differences.rst   | 10 +++++-
 Documentation/core-api/swiotlb.rst                 |  2 +-
 Documentation/core-api/this_cpu_ops.rst            |  6 ++--
 Documentation/core-api/xarray.rst                  |  4 ++-
 Documentation/filesystems/proc.rst                 | 10 +++---
 Documentation/process/1.Intro.rst                  |  2 +-
 Documentation/process/2.Process.rst                | 18 +++++-----
 Documentation/process/3.Early-stage.rst            |  2 +-
 Documentation/process/5.Posting.rst                | 10 +++---
 Documentation/process/7.AdvancedTopics.rst         | 36 ++++++++++----------
 Documentation/process/backporting.rst              | 18 +++++-----
 .../process/embargoed-hardware-issues.rst          |  2 +-
 Documentation/process/maintainer-pgp-guide.rst     | 38 +++++++++++-----------
 19 files changed, 94 insertions(+), 82 deletions(-)
Merging v4l-dvb/next (f9536a8065d9e media: ipu-bridge: Add support additional link frequency)
$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 .../bindings/clock/nxp,imx95-blk-ctl.yaml          |  71 ++
 .../bindings/media/fsl,imx95-csi-formatter.yaml    |  88 +++
 .../devicetree/bindings/media/i2c/hynix,hi846.yaml |   3 +-
 .../bindings/media/i2c/ovti,ov08d10.yaml           |   3 +-
 .../devicetree/bindings/media/i2c/ovti,ov4689.yaml |   3 +-
 .../devicetree/bindings/media/i2c/ovti,ov5675.yaml |   3 +-
 .../devicetree/bindings/media/i2c/ovti,ov5693.yaml |   3 +-
 .../bindings/media/i2c/ovti,ov64a40.yaml           |   3 +-
 .../devicetree/bindings/media/i2c/sony,imx111.yaml |   3 +-
 .../devicetree/bindings/media/i2c/sony,imx355.yaml |   3 +-
 .../devicetree/bindings/media/i2c/sony,imx415.yaml |   3 +-
 .../devicetree/bindings/media/i2c/st,vd55g1.yaml   |   3 +-
 .../devicetree/bindings/media/i2c/st,vd56g3.yaml   |   3 +-
 .../bindings/media/i2c/thine,thp7312.yaml          |   3 +-
 .../bindings/media/nxp,imx8mq-mipi-csi2.yaml       |   4 +-
 .../bindings/media/video-interface-devices.yaml    |  17 +-
 MAINTAINERS                                        |  24 +
 drivers/media/i2c/cvs/v4l2.c                       |  13 +-
 drivers/media/i2c/ov8856.c                         |  32 +-
 drivers/media/pci/cx88/cx88-input.c                |  22 +-
 drivers/media/pci/intel/ipu-bridge.c               |  40 +-
 drivers/media/pci/saa7134/saa7134-input.c          |   7 +-
 drivers/media/platform/nxp/Kconfig                 |  16 +
 drivers/media/platform/nxp/Makefile                |   1 +
 drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c     |  23 +-
 drivers/media/platform/nxp/imx95-csi-formatter.c   | 758 +++++++++++++++++++++
 .../media/platform/renesas/rzg2l-cru/rzg2l-core.c  |   3 +-
 .../media/platform/renesas/rzg2l-cru/rzg2l-cru.h   |   2 +-
 .../media/platform/renesas/rzg2l-cru/rzg2l-video.c |  13 +-
 drivers/media/rc/bpf-lirc.c                        |  18 +-
 drivers/media/rc/imon.c                            |   9 +-
 drivers/media/rc/ir-hix5hd2.c                      |   5 +-
 drivers/media/rc/meson-ir-tx.c                     |  17 +-
 drivers/media/rc/rc-ir-raw.c                       |  47 +-
 drivers/media/rc/rc-main.c                         |  19 +-
 drivers/media/rc/redrat3.c                         |  32 +-
 drivers/media/rc/streamzap.c                       |   1 +
 drivers/media/rc/sunxi-cir.c                       |   2 +-
 drivers/media/v4l2-core/v4l2-common.c              |  20 +-
 drivers/platform/x86/intel/int3472/discrete.c      |  81 ++-
 drivers/platform/x86/intel/int3472/tps68470.c      |   2 +-
 drivers/staging/media/ipu3/ipu3-css.c              |   1 -
 .../dt-bindings/media/video-interface-devices.h    |  13 +
 include/linux/platform_data/x86/int3472.h          |   2 +
 include/media/v4l2-common.h                        |  75 +-
 45 files changed, 1312 insertions(+), 202 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/media/fsl,imx95-csi-formatter.yaml
 create mode 100644 drivers/media/platform/nxp/imx95-csi-formatter.c
 create mode 100644 include/dt-bindings/media/video-interface-devices.h
Merging v4l-dvb-next/master (adc218676eef2 Linux 6.12)
$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master
Already up to date.
Merging pm/linux-next (d21f03a73206f Merge branch 'fixes' into linux-next)
$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next
Merge made by the 'ort' strategy.
 drivers/cpufreq/cpufreq.c       |  6 +++---
 drivers/thermal/thermal_sysfs.c | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)
Merging cpufreq-arm/cpufreq/arm/linux-next (d82d896f00e7b cpufreq: Use %pe to print error pointers symbolically)
$ git merge -m Merge branch 'cpufreq/arm/linux-next' of https://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/airoha-cpufreq.c     |  2 +-
 drivers/cpufreq/bmips-cpufreq.c      |  4 ++--
 drivers/cpufreq/cppc_cpufreq.c       |  4 ++--
 drivers/cpufreq/qoriq-cpufreq.c      |  3 +--
 drivers/cpufreq/rcpufreq_dt.rs       |  1 +
 drivers/cpufreq/s3c64xx-cpufreq.c    |  5 ++---
 drivers/cpufreq/sparc-us2e-cpufreq.c | 11 +++++------
 drivers/cpufreq/sti-cpufreq.c        |  4 ++--
 drivers/cpufreq/tegra194-cpufreq.c   |  2 +-
 rust/kernel/cpufreq.rs               | 18 ++++++++++++++----
 10 files changed, 31 insertions(+), 23 deletions(-)
Merging cpupower/cpupower (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'cpupower' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower
Already up to date.
Merging devfreq/devfreq-next (9a222650d9e70 PM / devfreq: Fix governor_store() failing when device has no current governor)
$ git merge -m Merge branch 'devfreq-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next
Auto-merging drivers/devfreq/event/rockchip-dfi.c
Merge made by the 'ort' strategy.
 drivers/devfreq/devfreq.c            | 50 +++++++-----------------------------
 drivers/devfreq/event/rockchip-dfi.c |  4 ++-
 2 files changed, 12 insertions(+), 42 deletions(-)
Merging pmdomain/next (26b9ea4f00732 pmdomain: qcom: rpmhpd: Add RPMh power domains for SM7250)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next
Merge made by the 'ort' strategy.
 .../devicetree/bindings/power/qcom,rpmpd.yaml      |  2 ++
 drivers/pmdomain/qcom/rpmhpd.c                     | 41 ++++++++++++++++++++++
 drivers/pmdomain/renesas/rcar-sysc.h               | 12 +++++--
 include/dt-bindings/power/qcom,rpmhpd.h            |  1 +
 4 files changed, 53 insertions(+), 3 deletions(-)
Merging opp/opp/linux-next (a5096d4927d1e opp: Use %pe to print symbolic error name)
$ git merge -m Merge branch 'opp/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next
Auto-merging drivers/opp/core.c
Merge made by the 'ort' strategy.
 drivers/opp/core.c | 24 ++++++++++++------------
 drivers/opp/of.c   |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)
Merging thermal/thermal/linux-next (b115930d716de thermal/drivers/armada: Fix missing bitfields include)
$ git merge -m Merge branch 'thermal/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next
Already up to date.
Merging rdma/for-next (905dc5f0d98e3 RDMA/hns: Support setting GSI QP SL via debugfs)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next
Auto-merging drivers/infiniband/hw/hns/hns_roce_debugfs.c
Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.c
Merge made by the 'ort' strategy.
 drivers/infiniband/hw/hfi1/pcie.c               | 14 ++---
 drivers/infiniband/hw/hns/hns_roce_debugfs.c    | 55 ++++++++++++++++++++
 drivers/infiniband/hw/hns/hns_roce_debugfs.h    |  1 +
 drivers/infiniband/hw/hns/hns_roce_device.h     |  2 +
 drivers/infiniband/hw/hns/hns_roce_hw_v2.c      | 16 ++++--
 drivers/infiniband/hw/ionic/ionic_controlpath.c | 20 ++++++--
 drivers/infiniband/hw/ionic/ionic_fw.h          |  2 +
 drivers/infiniband/hw/ionic/ionic_lif_cfg.c     |  1 +
 drivers/infiniband/hw/ionic/ionic_lif_cfg.h     |  1 +
 drivers/infiniband/hw/mana/cq.c                 | 26 ++++++----
 drivers/infiniband/hw/mana/device.c             |  3 +-
 drivers/infiniband/hw/mana/main.c               | 32 +++++++++++-
 drivers/infiniband/hw/mana/mana_ib.h            | 26 ++++++++--
 drivers/infiniband/hw/mana/qp.c                 | 59 +++++++++++++++++----
 drivers/infiniband/hw/mlx5/data_direct.c        | 10 ++--
 drivers/infiniband/sw/rxe/rxe_loc.h             |  1 +
 drivers/infiniband/sw/rxe/rxe_net.c             | 68 +++++++++++++++++++++++--
 drivers/infiniband/sw/rxe/rxe_req.c             |  2 +-
 drivers/infiniband/sw/rxe/rxe_resp.c            |  4 +-
 drivers/infiniband/ulp/rtrs/rtrs-clt.c          | 23 +++++----
 include/net/mana/gdma.h                         |  1 +
 include/uapi/rdma/ionic-abi.h                   |  9 +++-
 include/uapi/rdma/mana-abi.h                    | 11 ++++
 23 files changed, 315 insertions(+), 72 deletions(-)
Merging net-next/main (31f961de2f90f net/mlx5: Use dma_wmb() for completion queue doorbell updates)
$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main
Auto-merging Documentation/netlink/specs/rt-link.yaml
Auto-merging MAINTAINERS
Auto-merging drivers/net/bonding/bond_alb.c
Auto-merging drivers/net/vxlan/vxlan_core.c
Auto-merging net/core/skbuff.c
Auto-merging net/ipv4/tcp_ipv4.c
Auto-merging net/unix/af_unix.c
Merge made by the 'ort' strategy.
 Documentation/admin-guide/sysctl/net.rst           |  14 +
 .../bindings/net/dsa/motorcomm,yt921x.yaml         |  23 +
 .../devicetree/bindings/net/dsa/realtek.yaml       |  33 +
 .../devicetree/bindings/net/fsl,fman-dtsec.yaml    |   4 -
 .../bindings/net/realtek,rtl9301-mdio.yaml         |  14 +-
 Documentation/netlink/specs/rt-link.yaml           |   6 +-
 .../device_drivers/ethernet/microsoft/netvsc.rst   |   2 -
 .../device_drivers/ethernet/stmicro/stmmac.rst     |   1 -
 Documentation/networking/proc_net_tcp.rst          |  20 +-
 MAINTAINERS                                        |   2 +-
 drivers/infiniband/ulp/ipoib/ipoib_main.c          |  27 +-
 drivers/net/bonding/bond_alb.c                     |  63 +-
 drivers/net/dsa/Kconfig                            |  10 +-
 drivers/net/dsa/Makefile                           |   2 +-
 drivers/net/dsa/motorcomm/Kconfig                  |  17 +
 drivers/net/dsa/motorcomm/Makefile                 |   5 +
 drivers/net/dsa/{yt921x.c => motorcomm/chip.c}     | 228 +-----
 drivers/net/dsa/{yt921x.h => motorcomm/chip.h}     |  15 +
 drivers/net/dsa/motorcomm/leds.c                   | 641 ++++++++++++++++
 drivers/net/dsa/motorcomm/leds.h                   | 118 +++
 drivers/net/dsa/motorcomm/smi.c                    | 180 +++++
 drivers/net/dsa/motorcomm/smi.h                    |  61 ++
 drivers/net/dsa/mt7530-mdio.c                      |  12 +-
 drivers/net/dsa/mt7530.c                           | 832 ++++++++++-----------
 drivers/net/dsa/mt7530.h                           | 221 +++---
 drivers/net/dsa/realtek/realtek.h                  |   3 +
 drivers/net/dsa/realtek/rtl8365mb_main.c           |   6 +
 drivers/net/dsa/realtek/rtl83xx.c                  |  23 +-
 drivers/net/ethernet/airoha/airoha_eth.h           |   3 +-
 drivers/net/ethernet/intel/i40e/i40e_main.c        |  70 +-
 drivers/net/ethernet/intel/i40e/i40e_txrx.c        |   5 +-
 drivers/net/ethernet/intel/i40e/i40e_txrx.h        |   7 +-
 drivers/net/ethernet/intel/i40e/i40e_type.h        |   5 +
 drivers/net/ethernet/intel/i40e/i40e_xsk.c         |  12 +
 .../ethernet/marvell/octeon_ep/octep_pfvf_mbox.c   |   1 -
 drivers/net/ethernet/marvell/octeontx2/af/cgx.c    |  13 +-
 drivers/net/ethernet/marvell/octeontx2/af/cgx.h    |   2 +
 .../ethernet/marvell/octeontx2/af/lmac_common.h    |   2 +
 drivers/net/ethernet/marvell/octeontx2/af/rpm.c    |  40 +-
 drivers/net/ethernet/marvell/octeontx2/af/rpm.h    |   2 +
 drivers/net/ethernet/marvell/octeontx2/af/rvu.h    |   1 +
 .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c    |  12 +
 .../ethernet/marvell/octeontx2/af/rvu_debugfs.c    |   8 +
 .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c   |  99 ++-
 .../net/ethernet/marvell/octeontx2/nic/otx2_reg.h  |   2 +
 .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c   |   9 +-
 .../ethernet/marvell/prestera/prestera_router.c    |  10 +-
 drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c   |   2 +-
 .../net/ethernet/mellanox/mlx5/core/en/rep/neigh.c |  29 +-
 .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c  |  23 +-
 drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c   |   2 +-
 .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c   |   6 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_rx.c    |   2 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_tx.c    |   2 +-
 .../net/ethernet/mellanox/mlx5/core/fpga/conn.c    |   2 +-
 drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c  |   2 +-
 .../net/ethernet/mellanox/mlxsw/spectrum_router.c  |  31 +-
 .../net/ethernet/mellanox/mlxsw/spectrum_span.c    |  10 +-
 drivers/net/ethernet/meta/fbnic/fbnic_fw.c         |   9 +-
 drivers/net/ethernet/meta/fbnic/fbnic_tlv.c        |  13 +-
 drivers/net/ethernet/microsoft/mana/mana_bpf.c     |   3 -
 .../ethernet/netronome/nfp/flower/tunnel_conf.c    |  14 +-
 drivers/net/ethernet/realtek/Kconfig               |   2 +-
 drivers/net/ethernet/realtek/r8169_main.c          | 705 +++++++++++++----
 drivers/net/ethernet/rocker/rocker_main.c          |   2 +-
 drivers/net/ethernet/rocker/rocker_ofdpa.c         |   2 +-
 drivers/net/ethernet/sfc/tc_counters.c             |   8 +-
 drivers/net/ethernet/sfc/tc_encap_actions.c        |   4 +-
 drivers/net/ethernet/stmicro/stmmac/common.h       |   5 +
 drivers/net/ethernet/stmicro/stmmac/dwmac4.h       |   6 +-
 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c  |  79 +-
 drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c   |   2 +
 .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c    |  18 -
 drivers/net/ethernet/stmicro/stmmac/hwif.h         |   3 -
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |  62 +-
 .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 112 ---
 drivers/net/ethernet/wangxun/libwx/wx_hw.c         |   2 +-
 drivers/net/ethernet/wangxun/libwx/wx_type.h       |   6 +-
 drivers/net/hyperv/netvsc.c                        |  10 +-
 drivers/net/mdio/Kconfig                           |   4 +-
 drivers/net/mdio/mdio-realtek-rtl9300.c            | 426 ++++++++++-
 drivers/net/netdevsim/bus.c                        |   7 +-
 drivers/net/netdevsim/netdev.c                     |  10 +-
 drivers/net/pcs/pcs-lynx.c                         |   6 +-
 drivers/net/phy/air_en8811h.c                      |  21 +-
 drivers/net/phy/dp83848.c                          |   3 +
 drivers/net/phy/phy_device.c                       | 270 ++++---
 drivers/net/phy/phy_led_triggers.c                 |  11 +-
 drivers/net/phy/phylink.c                          | 176 +++--
 drivers/net/phy/realtek/realtek_main.c             |  54 --
 drivers/net/vrf.c                                  |   2 +-
 drivers/net/vxlan/vxlan_core.c                     |  16 +-
 drivers/usb/atm/cxacru.c                           |  16 +-
 drivers/usb/atm/speedtch.c                         |   4 +-
 include/linux/netdevice.h                          |   8 +-
 include/linux/phy.h                                |  18 +
 include/linux/phylink.h                            |   2 +
 include/net/arp.h                                  |  10 +-
 include/net/bond_alb.h                             |  14 +-
 include/net/ndisc.h                                |  20 +-
 include/net/neighbour.h                            |  22 +-
 include/net/net_namespace.h                        |   4 +
 include/net/phy/realtek_phy.h                      |   7 -
 include/net/route.h                                |   7 +-
 include/net/tcp.h                                  |  15 +-
 net/8021q/vlan.c                                   |   8 +-
 net/8021q/vlan.h                                   |  20 +-
 net/atm/proc.c                                     |   7 +-
 net/batman-adv/bat_iv_ogm.c                        |  25 +-
 net/batman-adv/bat_v.c                             |  42 +-
 net/batman-adv/bridge_loop_avoidance.c             |   6 +-
 net/batman-adv/distributed-arp-table.c             |  10 +-
 net/batman-adv/mesh-interface.c                    |  12 +-
 net/batman-adv/multicast.c                         |   6 +-
 net/batman-adv/translation-table.c                 | 507 +++++++++----
 net/batman-adv/types.h                             |  49 +-
 net/bridge/br_arp_nd_proxy.c                       |   4 +-
 net/core/neighbour.c                               | 428 ++++++-----
 net/core/netdev-genl.c                             |  26 +-
 net/core/page_pool_user.c                          |   8 +-
 net/core/skbuff.c                                  |  32 +-
 net/core/sysctl_net_core.c                         |  10 +
 net/devlink/dev.c                                  |   4 +-
 net/ieee802154/6lowpan/tx.c                        |   3 +-
 net/ipv4/arp.c                                     | 137 ++--
 net/ipv4/bpf_tcp_ca.c                              |   5 +-
 net/ipv4/devinet.c                                 |  18 +-
 net/ipv4/fib_semantics.c                           |   7 +-
 net/ipv4/ping.c                                    |   5 +-
 net/ipv4/raw.c                                     |   4 +-
 net/ipv4/route.c                                   |   2 +-
 net/ipv4/tcp_bbr.c                                 |  13 +-
 net/ipv4/tcp_ipv4.c                                |  13 +-
 net/ipv4/tcp_output.c                              |  28 +-
 net/ipv4/udp.c                                     |   5 +-
 net/ipv6/addrconf.c                                |  17 +-
 net/ipv6/datagram.c                                |   5 +-
 net/ipv6/ip6_output.c                              |   4 +-
 net/ipv6/ndisc.c                                   | 148 ++--
 net/ipv6/route.c                                   |  18 +-
 net/ipv6/tcp_ipv6.c                                |  12 +-
 net/key/af_key.c                                   |   5 +-
 net/netlink/af_netlink.c                           |   5 +-
 net/openvswitch/datapath.c                         |  14 +-
 net/openvswitch/datapath.h                         |   2 +-
 net/packet/af_packet.c                             |   7 +-
 net/phonet/socket.c                                |   5 +-
 net/sctp/proc.c                                    |   6 +-
 net/unix/af_unix.c                                 |   3 +-
 tools/testing/selftests/bpf/progs/tcp_ca_kfunc.c   |   8 +-
 tools/testing/selftests/drivers/net/Makefile       |   9 +-
 tools/testing/selftests/drivers/net/gro_hw.py      |  13 +
 .../selftests/drivers/net/{gro.py => gro_lib.py}   |  68 +-
 tools/testing/selftests/drivers/net/gro_lro.py     |  14 +
 tools/testing/selftests/drivers/net/gro_sw.py      |  13 +
 tools/testing/selftests/drivers/net/hw/Makefile    |   2 +-
 .../drivers/net/hw/{gro_hw.py => gro_stats.py}     |   0
 tools/testing/selftests/drivers/net/pppoe_gro.py   |  45 ++
 tools/testing/selftests/drivers/net/settings       |   2 +-
 tools/testing/selftests/net/bind_wildcard.c        |   5 +
 .../selftests/net/lib/ksft_setup_loopback.sh       |   2 +-
 tools/testing/selftests/net/test_neigh.sh          |  66 +-
 162 files changed, 4836 insertions(+), 2323 deletions(-)
 create mode 100644 drivers/net/dsa/motorcomm/Kconfig
 create mode 100644 drivers/net/dsa/motorcomm/Makefile
 rename drivers/net/dsa/{yt921x.c => motorcomm/chip.c} (96%)
 rename drivers/net/dsa/{yt921x.h => motorcomm/chip.h} (99%)
 create mode 100644 drivers/net/dsa/motorcomm/leds.c
 create mode 100644 drivers/net/dsa/motorcomm/leds.h
 create mode 100644 drivers/net/dsa/motorcomm/smi.c
 create mode 100644 drivers/net/dsa/motorcomm/smi.h
 delete mode 100644 include/net/phy/realtek_phy.h
 create mode 100755 tools/testing/selftests/drivers/net/gro_hw.py
 rename tools/testing/selftests/drivers/net/{gro.py => gro_lib.py} (92%)
 mode change 100755 => 100644
 create mode 100755 tools/testing/selftests/drivers/net/gro_lro.py
 create mode 100755 tools/testing/selftests/drivers/net/gro_sw.py
 rename tools/testing/selftests/drivers/net/hw/{gro_hw.py => gro_stats.py} (100%)
 create mode 100755 tools/testing/selftests/drivers/net/pppoe_gro.py
Merging bpf-next/for-next (1b7415bf70be9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 7.3-rc2)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next
Auto-merging arch/x86/Kconfig
Merge made by the 'ort' strategy.
 Documentation/admin-guide/kernel-parameters.txt    |  16 +
 Documentation/bpf/kfuncs.rst                       |  74 +++
 Documentation/bpf/signing.rst                      | 283 ++++++++--
 arch/arm64/net/bpf_jit_comp.c                      |   5 +
 arch/riscv/net/bpf_jit.h                           |   4 +
 arch/riscv/net/bpf_jit_comp64.c                    | 109 +++-
 arch/riscv/net/bpf_jit_core.c                      |   7 +
 arch/riscv/net/bpf_timed_may_goto.S                |   8 +-
 arch/x86/Kconfig                                   |   1 +
 arch/x86/net/bpf_jit_comp.c                        | 295 ++++++++--
 include/linux/bpf.h                                |  21 +-
 include/linux/bpf_verifier.h                       |  32 ++
 include/linux/btf.h                                |   1 +
 include/linux/filter.h                             |   1 +
 include/linux/key.h                                |   2 +
 include/uapi/linux/keyctl.h                        |   1 +
 kernel/bpf/Kconfig                                 |  17 +
 kernel/bpf/Makefile                                |   3 +
 kernel/bpf/backtrack.c                             |  32 +-
 kernel/bpf/btf.c                                   | 109 ++--
 kernel/bpf/cnum_defs.h                             |  37 +-
 kernel/bpf/core.c                                  |   5 +
 kernel/bpf/fixups.c                                |  33 +-
 kernel/bpf/keys.c                                  |  73 +++
 kernel/bpf/liveness.c                              |  20 +-
 kernel/bpf/queue_stack_maps.c                      |   3 +
 kernel/bpf/stream.c                                |  55 +-
 kernel/bpf/verifier.c                              | 442 ++++++++++++---
 security/keys/process_keys.c                       |  25 +
 tools/bpf/bpftool/btf.c                            |   6 +-
 tools/bpf/bpftool/main.c                           |  30 +-
 tools/bpf/bpftool/main.h                           |   2 +-
 tools/bpf/bpftool/prog.c                           |   2 +-
 tools/bpf/bpftool/sign.c                           |  24 +-
 tools/lib/bpf/btf.c                                |  14 +-
 tools/lib/bpf/libbpf.c                             |  22 +-
 tools/lib/bpf/libbpf_internal.h                    |   4 +-
 tools/lib/bpf/libbpf_probes.c                      |  11 +-
 tools/lib/bpf/usdt.c                               |   4 +
 tools/testing/selftests/bpf/.gitignore             |   1 -
 tools/testing/selftests/bpf/Makefile               |  31 +-
 tools/testing/selftests/bpf/bench.c                |   6 +
 .../testing/selftests/bpf/benchs/bench_libarena.c  | 210 ++++++++
 .../selftests/bpf/benchs/run_bench_libarena.sh     |  31 ++
 .../selftests/bpf/bpftool_btf_dump_sorted.expected |  48 ++
 .../bpf/bpftool_btf_dump_unsorted.expected         |  48 ++
 tools/testing/selftests/bpf/bpftool_helpers.c      |   7 +-
 tools/testing/selftests/bpf/config                 |   2 +
 tools/testing/selftests/bpf/libarena/Makefile      |  31 +-
 .../bpf/libarena/benchs/bench_malloc.bpf.c         |  51 ++
 .../bpf/libarena/include/bpf_arena_spin_lock.h     |   2 +-
 .../selftests/bpf/libarena/include/bpf_atomic.h    |   2 +-
 .../selftests/bpf/libarena/include/bpf_may_goto.h  |   1 +
 .../bpf/libarena/include/libarena/bitmap.h         |  30 +-
 .../bpf/libarena/include/libarena/common.h         |  71 +++
 .../bpf/libarena/selftests/test_bitmap.bpf.c       |   3 +
 .../testing/selftests/bpf/libarena/src/asan.bpf.c  |  21 +-
 .../selftests/bpf/libarena/src/bitmap.bpf.c        |  18 -
 .../testing/selftests/bpf/libarena/src/buddy.bpf.c |  44 +-
 .../selftests/bpf/libarena/src/common.bpf.c        |  27 +-
 tools/testing/selftests/bpf/network_helpers.c      |  46 +-
 .../selftests/bpf/prog_tests/aggregate_ret.c       |  53 ++
 .../selftests/bpf/prog_tests/attach_probe.c        |   6 +-
 .../selftests/bpf/prog_tests/bpf_verif_scale.c     |   2 +-
 .../selftests/bpf/prog_tests/bpftool_btf_dump.c    | 178 ++++++
 tools/testing/selftests/bpf/prog_tests/btf_dump.c  | 127 +++--
 .../testing/selftests/bpf/prog_tests/core_reloc.c  |  10 +-
 .../selftests/bpf/prog_tests/fexit_bpf2bpf.c       |  16 +
 .../selftests/bpf/prog_tests/global_data_init.c    |  96 +++-
 tools/testing/selftests/bpf/prog_tests/kasan.c     | 479 ++++++++++++++++
 .../testing/selftests/bpf/prog_tests/kernel_flag.c |   3 +
 .../selftests/bpf/prog_tests/kprobe_multi_test.c   |   2 +-
 .../testing/selftests/bpf/prog_tests/lirc_mode2.c  | 334 ++++++++++++
 .../bpf/prog_tests/prog_tests_framework.c          |  23 +
 .../selftests/bpf/prog_tests/queue_stack_map.c     |  29 +
 .../selftests/bpf/prog_tests/signed_loader.c       | 600 +++++++++++++++++----
 tools/testing/selftests/bpf/prog_tests/stream.c    |  67 +++
 tools/testing/selftests/bpf/prog_tests/usdt.c      |  54 ++
 tools/testing/selftests/bpf/prog_tests/verifier.c  |   2 +
 .../selftests/bpf/prog_tests/verify_pkcs7_sig.c    |   4 +-
 .../selftests/bpf/prog_tests/xdp_adjust_frags.c    |   3 +
 .../selftests/bpf/prog_tests/xdp_devmap_attach.c   |   5 +
 .../selftests/bpf/prog_tests/xdp_metadata.c        |   4 +-
 .../selftests/bpf/progs/aggregate_ret_func.c       | 383 +++++++++++++
 .../selftests/bpf/progs/aggregate_ret_kfunc.c      | 203 +++++++
 .../bpf/progs/aggregate_ret_kfunc_arena.c          | 121 +++++
 .../selftests/bpf/progs/aggregate_ret_target.c     |  29 +
 tools/testing/selftests/bpf/progs/arena_kfunc.c    |   3 +-
 tools/testing/selftests/bpf/progs/bpf_misc.h       |  10 +-
 .../selftests/bpf/progs/btf__stack_arg_precision.c |   3 +-
 .../bpf/progs/btf__verifier_stack_arg_order.c      |   3 +-
 .../selftests/bpf/progs/compute_live_registers.c   |  36 ++
 .../testing/selftests/bpf/progs/exceptions_fail.c  |   2 +-
 .../selftests/bpf/progs/freplace_ret_pair.c        |  12 +
 tools/testing/selftests/bpf/progs/kasan.c          | 502 +++++++++++++++++
 tools/testing/selftests/bpf/progs/kasan_harden.c   |  52 ++
 tools/testing/selftests/bpf/progs/lirc_mode2.c     |  32 ++
 tools/testing/selftests/bpf/progs/stack_arg.c      |   3 +-
 tools/testing/selftests/bpf/progs/stack_arg_fail.c |   3 +-
 .../testing/selftests/bpf/progs/stack_arg_kfunc.c  |   3 +-
 .../selftests/bpf/progs/stack_arg_precision.c      |   4 +-
 tools/testing/selftests/bpf/progs/stream.c         |  28 +
 .../selftests/bpf/progs/test_global_percpu_data.c  |  10 +-
 .../selftests/bpf/progs/test_lirc_mode2_kern.c     |  26 -
 .../selftests/bpf/progs/verifier_aggregate_ret.c   | 179 ++++++
 tools/testing/selftests/bpf/progs/verifier_arena.c |  48 ++
 tools/testing/selftests/bpf/progs/verifier_bswap.c |   3 +-
 tools/testing/selftests/bpf/progs/verifier_gotol.c |   1 +
 .../selftests/bpf/progs/verifier_jit_inline.c      |   2 +-
 tools/testing/selftests/bpf/progs/verifier_ldsx.c  |  36 +-
 .../selftests/bpf/progs/verifier_load_acquire.c    |   1 +
 tools/testing/selftests/bpf/progs/verifier_movsx.c |   3 +-
 .../selftests/bpf/progs/verifier_percpu_addr.c     |   1 +
 .../selftests/bpf/progs/verifier_private_stack.c   |   1 +
 tools/testing/selftests/bpf/progs/verifier_sdiv.c  |   3 +-
 .../selftests/bpf/progs/verifier_stack_arg.c       |   4 +-
 .../selftests/bpf/progs/verifier_stack_arg_order.c |   4 +-
 .../selftests/bpf/progs/verifier_store_release.c   |   1 +
 tools/testing/selftests/bpf/test_btf.h             |   2 +-
 .../testing/selftests/bpf/test_kmods/bpf_testmod.c | 182 +++++++
 .../selftests/bpf/test_kmods/bpf_testmod_kfunc.h   | 101 ++++
 tools/testing/selftests/bpf/test_lirc_mode2.sh     |  41 --
 tools/testing/selftests/bpf/test_lirc_mode2_user.c | 177 ------
 tools/testing/selftests/bpf/test_loader.c          |   9 +
 tools/testing/selftests/bpf/testing_helpers.c      |  43 ++
 tools/testing/selftests/bpf/testing_helpers.h      |   3 +
 tools/testing/selftests/bpf/unpriv_helpers.c       |  19 +-
 tools/testing/selftests/bpf/unpriv_helpers.h       |   2 +
 tools/testing/selftests/bpf/usdt_2.c               |  16 +
 tools/testing/selftests/bpf/verify_sig_setup.sh    |  63 ++-
 tools/testing/selftests/bpf/vmtest.sh              |  16 +-
 tools/testing/selftests/bpf/xdp_hw_metadata.c      |   2 +-
 132 files changed, 6218 insertions(+), 874 deletions(-)
 create mode 100644 kernel/bpf/keys.c
 create mode 100644 tools/testing/selftests/bpf/benchs/bench_libarena.c
 create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_libarena.sh
 create mode 100644 tools/testing/selftests/bpf/bpftool_btf_dump_sorted.expected
 create mode 100644 tools/testing/selftests/bpf/bpftool_btf_dump_unsorted.expected
 create mode 100644 tools/testing/selftests/bpf/libarena/benchs/bench_malloc.bpf.c
 create mode 100644 tools/testing/selftests/bpf/prog_tests/aggregate_ret.c
 create mode 100644 tools/testing/selftests/bpf/prog_tests/bpftool_btf_dump.c
 create mode 100644 tools/testing/selftests/bpf/prog_tests/kasan.c
 create mode 100644 tools/testing/selftests/bpf/prog_tests/lirc_mode2.c
 create mode 100644 tools/testing/selftests/bpf/progs/aggregate_ret_func.c
 create mode 100644 tools/testing/selftests/bpf/progs/aggregate_ret_kfunc.c
 create mode 100644 tools/testing/selftests/bpf/progs/aggregate_ret_kfunc_arena.c
 create mode 100644 tools/testing/selftests/bpf/progs/aggregate_ret_target.c
 create mode 100644 tools/testing/selftests/bpf/progs/freplace_ret_pair.c
 create mode 100644 tools/testing/selftests/bpf/progs/kasan.c
 create mode 100644 tools/testing/selftests/bpf/progs/kasan_harden.c
 create mode 100644 tools/testing/selftests/bpf/progs/lirc_mode2.c
 delete mode 100644 tools/testing/selftests/bpf/progs/test_lirc_mode2_kern.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_aggregate_ret.c
 delete mode 100755 tools/testing/selftests/bpf/test_lirc_mode2.sh
 delete mode 100644 tools/testing/selftests/bpf/test_lirc_mode2_user.c
$ git am -3 ../patches/0001-perf-Fixup-for-btf_vlan-API-change.patch
Applying: perf: Fixup for btf_vlan() API change
Using index info to reconstruct a base tree...
M	tools/perf/builtin-trace.c
M	tools/perf/util/btf.c
Falling back to patching base and 3-way merge...
Auto-merging tools/perf/builtin-trace.c
No changes -- Patch already applied.
Merging ipsec-next/master (6ebcf5074cff0 net: openvswitch: don't schedule rebalancing if there are no datapaths)
$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master
Already up to date.
Merging mlx5-next/mlx5-next (36b1d3299d0b6 net/mlx5: Add qp_latency_sensitive_disable cap bit)
$ git merge -m Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next
Already up to date.
Merging netfilter-next/main (6ebcf5074cff0 net: openvswitch: don't schedule rebalancing if there are no datapaths)
$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main
Already up to date.
Merging ipvs-next/main (91ec203513498 Merge tag 'net-next-7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main
Already up to date.
Merging bluetooth/master (755cf7adf8dd2 Bluetooth: btintel_pcie: unified decoder coredump format)
$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master
Auto-merging drivers/bluetooth/btintel.c
Auto-merging drivers/bluetooth/btintel_pcie.c
Auto-merging drivers/bluetooth/btmtk.c
Auto-merging drivers/bluetooth/btmtksdio.c
Auto-merging drivers/bluetooth/btnxpuart.c
Auto-merging drivers/bluetooth/btrtl.c
Auto-merging drivers/bluetooth/btusb.c
Auto-merging drivers/bluetooth/hci_bcm.c
Auto-merging drivers/bluetooth/hci_serdev.c
Auto-merging include/net/bluetooth/hci_core.h
Auto-merging include/net/bluetooth/l2cap.h
Auto-merging net/bluetooth/hci_core.c
Auto-merging net/bluetooth/hci_sync.c
CONFLICT (content): Merge conflict in net/bluetooth/hci_sync.c
Auto-merging net/bluetooth/l2cap_core.c
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
Auto-merging net/bluetooth/l2cap_sock.c
Auto-merging net/bluetooth/mgmt.c
Resolved 'net/bluetooth/hci_sync.c' using previous resolution.
Resolved 'net/bluetooth/l2cap_core.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 7e615d9c216c1] Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
$ git diff -M --stat --summary HEAD^..
 .../bindings/net/bluetooth/brcm,bluetooth.yaml     |    1 +
 drivers/bluetooth/btbcm.c                          |    6 +-
 drivers/bluetooth/btintel.c                        |    7 +
 drivers/bluetooth/btintel.h                        |    3 +
 drivers/bluetooth/btintel_pcie.c                   | 1382 +++++++++++++++++---
 drivers/bluetooth/btintel_pcie.h                   |  254 +++-
 drivers/bluetooth/btmrvl_main.c                    |    4 +-
 drivers/bluetooth/btmtk.c                          |   15 +-
 drivers/bluetooth/btmtk.h                          |    1 +
 drivers/bluetooth/btmtksdio.c                      |   35 +-
 drivers/bluetooth/btqcomsmd.c                      |    6 +-
 drivers/bluetooth/btrtl.c                          |    5 +-
 drivers/bluetooth/btusb.c                          |  324 ++++-
 drivers/bluetooth/hci_bcm.c                        |    1 +
 drivers/bluetooth/hci_h4.c                         |  123 +-
 drivers/bluetooth/hci_serdev.c                     |   46 +-
 drivers/bluetooth/hci_uart.h                       |   39 +-
 drivers/bluetooth/virtio_bt.c                      |   21 +-
 include/net/bluetooth/hci_core.h                   |   44 +
 include/net/bluetooth/hci_h4.h                     |   60 +
 include/net/bluetooth/l2cap.h                      |  102 +-
 net/bluetooth/6lowpan.c                            |   44 +-
 net/bluetooth/Makefile                             |    2 +-
 net/bluetooth/bnep/core.c                          |    4 +-
 net/bluetooth/hci_core.c                           |    2 +-
 net/bluetooth/hci_h4.c                             |  160 +++
 net/bluetooth/hci_sync.c                           |  102 +-
 net/bluetooth/hci_sysfs.c                          |   17 +-
 net/bluetooth/l2cap_core.c                         |  287 +++-
 net/bluetooth/l2cap_sock.c                         |   96 +-
 net/bluetooth/mgmt.c                               |   14 +-
 scripts/context-analysis-suppression.txt           |    1 +
 32 files changed, 2603 insertions(+), 605 deletions(-)
 create mode 100644 include/net/bluetooth/hci_h4.h
 create mode 100644 net/bluetooth/hci_h4.c
Merging wireless-next/for-next (1b60ed34f712e wifi: mac80211: serialize debugfs netdev rename with recreate)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next
Auto-merging drivers/net/wireless/marvell/mwifiex/cfg80211.c
Auto-merging net/mac80211/tx.c
Auto-merging net/wireless/nl80211.c
Merge made by the 'ort' strategy.
 .../bindings/net/wireless/marvell,sd8787.yaml      |   6 +
 .../bindings/net/wireless/silabs,wfx.yaml          |   3 +
 drivers/net/wireless/broadcom/b43legacy/dma.c      |  24 +-
 drivers/net/wireless/broadcom/b43legacy/dma.h      |   4 +-
 drivers/net/wireless/marvell/libertas/if_usb.c     |  10 +-
 drivers/net/wireless/marvell/libertas_tf/if_usb.c  |  10 +-
 .../net/wireless/marvell/mwifiex/11n_rxreorder.c   |  20 +-
 drivers/net/wireless/marvell/mwifiex/cfg80211.c    |   7 +
 drivers/net/wireless/marvell/mwifiex/main.h        |   2 +-
 drivers/net/wireless/silabs/wfx/bh.c               |   6 +-
 drivers/net/wireless/silabs/wfx/bus_sdio.c         |   1 +
 drivers/net/wireless/silabs/wfx/main.c             |  34 +-
 include/linux/ieee80211-eht.h                      |  18 +-
 include/linux/ieee80211-uhr.h                      | 101 +++---
 include/net/cfg80211.h                             |   2 +-
 include/net/mac80211.h                             |  40 +--
 include/uapi/linux/nl80211.h                       |   4 +
 net/mac80211/debugfs.c                             |   2 +-
 net/mac80211/debugfs_netdev.c                      |   8 +-
 net/mac80211/ieee80211_i.h                         |  18 +-
 net/mac80211/iface.c                               |   2 +-
 net/mac80211/mlme.c                                |  14 +-
 net/mac80211/rate.c                                |   1 -
 net/mac80211/rx.c                                  |   8 +-
 net/mac80211/s1g.c                                 |   8 -
 net/mac80211/tdls.c                                |   2 +-
 net/mac80211/tx.c                                  | 351 +++++++++++----------
 net/wireless/chan.c                                |  11 +-
 net/wireless/nl80211.c                             |  14 +-
 29 files changed, 397 insertions(+), 334 deletions(-)
Merging ath-next/for-next (1d8e73163ef93 wifi: ath11k: unregister PM notifier on QMI init failure path)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next
Auto-merging .mailmap
Merge made by the 'ort' strategy.
 .mailmap                                           | 13 ++++++---
 .../bindings/net/wireless/qcom,ath12k-wsi.yaml     |  7 -----
 drivers/net/wireless/ath/ath11k/Kconfig            |  3 +++
 drivers/net/wireless/ath/ath11k/ahb.c              | 16 ++++++++---
 drivers/net/wireless/ath/ath11k/core.c             | 10 +++++++
 drivers/net/wireless/ath/ath11k/dp.c               |  2 ++
 drivers/net/wireless/ath/ath12k/core.c             | 23 ++++++++++++++++
 drivers/net/wireless/ath/ath12k/mac.c              | 31 ++++++++++++++++++----
 drivers/net/wireless/ath/ath12k/qmi.c              |  4 +++
 drivers/net/wireless/ath/ath12k/wmi.c              | 16 ++++++-----
 10 files changed, 100 insertions(+), 25 deletions(-)
Merging iwlwifi-next/next (4a2610a5a9fcf wifi: iwlwifi: bump core version for BZ/SC/DR)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi-next/next
Already up to date.
Merging wpan-next/master (a6bfdfcc6711d ieee802154: allow legacy LLSEC ADD/DEL ops to pass strict validation)
$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master
Already up to date.
Merging wpan-staging/staging (a6bfdfcc6711d ieee802154: allow legacy LLSEC ADD/DEL ops to pass strict validation)
$ git merge -m Merge branch 'staging' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging
Already up to date.
Merging mtd/mtd/next (90936c3c790ec mtd: fix typos in comments)
$ git merge -m Merge branch 'mtd/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next
Merge made by the 'ort' strategy.
 drivers/mtd/devices/docg3.c                | 4 ++--
 drivers/mtd/nand/onenand/onenand_base.c    | 2 +-
 drivers/mtd/nand/raw/fsmc_nand.c           | 2 +-
 drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +-
 drivers/mtd/nand/raw/mtk_nand.c            | 2 +-
 drivers/mtd/nand/raw/nand_base.c           | 2 +-
 drivers/mtd/nand/raw/nand_legacy.c         | 4 ++--
 drivers/mtd/spi-nor/otp.c                  | 2 +-
 include/linux/mtd/bbm.h                    | 2 +-
 include/linux/mtd/rawnand.h                | 2 +-
 include/linux/mtd/sh_flctl.h               | 4 ++--
 11 files changed, 14 insertions(+), 14 deletions(-)
Merging nand/nand/next (def559a215699 mtd: rawnand: lpc32xx_mlc: Remove platform data support)
$ git merge -m Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next
Auto-merging drivers/mtd/nand/spi/core.c
Merge made by the 'ort' strategy.
 drivers/mtd/nand/raw/brcmnand/brcmnand.c |   2 +
 drivers/mtd/nand/raw/lpc32xx_mlc.c       |  21 +---
 drivers/mtd/nand/raw/lpc32xx_slc.c       |  21 +---
 drivers/mtd/nand/raw/ndfc.c              |  21 ++--
 drivers/mtd/nand/raw/omap2.c             |   4 +-
 drivers/mtd/nand/raw/stm32_fmc2_nand.c   |   8 +-
 drivers/mtd/nand/raw/sunxi_nand.c        |  32 ++++--
 drivers/mtd/nand/spi/Makefile            |   2 +-
 drivers/mtd/nand/spi/core.c              |   1 +
 drivers/mtd/nand/spi/issi.c              | 187 +++++++++++++++++++++++++++++++
 drivers/mtd/nand/spi/winbond.c           |  35 +++++-
 include/linux/mtd/lpc32xx_mlc.h          |  17 ---
 include/linux/mtd/lpc32xx_slc.h          |  17 ---
 include/linux/mtd/spinand.h              |   1 +
 14 files changed, 262 insertions(+), 107 deletions(-)
 create mode 100644 drivers/mtd/nand/spi/issi.c
 delete mode 100644 include/linux/mtd/lpc32xx_mlc.h
 delete mode 100644 include/linux/mtd/lpc32xx_slc.h
Merging spi-nor/spi-nor/next (700bf34058ca7 mtd: spi-nor: debugfs: Expose SR opcodes and QE mask)
$ git merge -m Merge branch 'spi-nor/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next
Auto-merging drivers/mtd/spi-nor/otp.c
Merge made by the 'ort' strategy.
 Documentation/driver-api/mtd/spi-nor.rst |    2 +-
 drivers/mtd/spi-nor/atmel.c              |   75 ++-
 drivers/mtd/spi-nor/core.c               | 1026 ++++++++++++------------------
 drivers/mtd/spi-nor/core.h               |  144 +++--
 drivers/mtd/spi-nor/debugfs.c            |   31 +-
 drivers/mtd/spi-nor/everspin.c           |    7 +-
 drivers/mtd/spi-nor/gigadevice.c         |   15 +-
 drivers/mtd/spi-nor/issi.c               |   29 +-
 drivers/mtd/spi-nor/macronix.c           |   73 ++-
 drivers/mtd/spi-nor/micron-st.c          |   70 +-
 drivers/mtd/spi-nor/otp.c                |   16 +-
 drivers/mtd/spi-nor/sfdp.c               |  230 +++++--
 drivers/mtd/spi-nor/sfdp.h               |   23 +-
 drivers/mtd/spi-nor/spansion.c           |  103 +--
 drivers/mtd/spi-nor/sst.c                |   16 +-
 drivers/mtd/spi-nor/swp.c                |  133 ++--
 drivers/mtd/spi-nor/sysfs.c              |    4 +-
 drivers/mtd/spi-nor/winbond.c            |  241 +++++--
 drivers/mtd/spi-nor/xmc.c                |    1 +
 include/linux/mtd/spi-nor.h              |   10 +-
 20 files changed, 1211 insertions(+), 1038 deletions(-)
Merging crypto/master (5358248961ae2 crypto: starfive - handle clock enable failures)
$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master
Auto-merging arch/arm64/crypto/aes-neonbs-glue.c
Auto-merging lib/test_rhashtable.c
Merge made by the 'ort' strategy.
 arch/arm/crypto/aes-neonbs-glue.c                  |   2 +-
 arch/arm64/crypto/aes-neonbs-glue.c                |   2 +-
 crypto/asymmetric_keys/Kconfig                     |  12 +++
 crypto/asymmetric_keys/Makefile                    |   2 +
 crypto/asymmetric_keys/verify_pefile.c             |   5 ++
 crypto/asymmetric_keys/verify_pefile_test.c        | 100 +++++++++++++++++++++
 drivers/char/hw_random/cctrng.c                    |   7 +-
 drivers/crypto/amcc/crypto4xx_core.c               |  29 +++---
 drivers/crypto/aspeed/aspeed-hace-crypto.c         |   3 +-
 drivers/crypto/ccree/cc_aead.c                     |   4 +-
 drivers/crypto/inside-secure/eip93/eip93-aead.c    |   3 +-
 drivers/crypto/inside-secure/safexcel_cipher.c     |  16 ++--
 drivers/crypto/inside-secure/safexcel_hash.c       |   3 +-
 drivers/crypto/intel/qat/qat_common/qat_algs.c     |   3 +-
 drivers/crypto/marvell/octeontx/otx_cptvf_algs.c   |   7 +-
 drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c |   7 +-
 drivers/crypto/padlock-aes.c                       |  22 +++--
 drivers/crypto/qce/aead.c                          |   9 +-
 drivers/crypto/qce/sha.c                           |   9 +-
 drivers/crypto/qce/skcipher.c                      |   9 +-
 drivers/crypto/rockchip/rk3288_crypto.c            |   4 +-
 drivers/crypto/s5p-sss.c                           |   5 +-
 drivers/crypto/sa2ul.c                             |   2 +-
 drivers/crypto/starfive/jh7110-cryp.c              |  11 ++-
 include/crypto/aes.h                               |  13 +++
 include/linux/rhashtable-types.h                   |   3 +
 include/linux/rhashtable.h                         |  22 ++---
 lib/rhashtable.c                                   |  14 ++-
 lib/test_rhashtable.c                              |   2 +-
 29 files changed, 230 insertions(+), 100 deletions(-)
 create mode 100644 crypto/asymmetric_keys/verify_pefile_test.c
Merging libcrypto/libcrypto-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'libcrypto-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next
Already up to date.
Merging drm/drm-next (df2908090cda3 Linux 7.3-rc2)
$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next
Already up to date.
$ git am -3 ../patches/0001-drm-Fix-up-lut3d-mismerge.patch
Applying: drm: Fix up lut3d mismerge
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/drm_atomic.c
M	include/drm/drm_colorop.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drm_colorop.h
Auto-merging drivers/gpu/drm/drm_atomic.c
No changes -- Patch already applied.
$ git am -3 ../patches/0001-drm-amdgpu_dpm-Fix-up-commiting-unresolved-merge.patch
Applying: drm: amdgpu_dpm: Fix up commiting unresolved merge
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/amd/pm/amdgpu_dpm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/amd/pm/amdgpu_dpm.c
No changes -- Patch already applied.
Merging drm-exynos/for-linux-next (3a8660878839f Linux 6.18-rc1)
$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next
Already up to date.
Merging drm-misc/for-linux-next (a9f09b5ea0c3d drm/bridge: dw-hdmi-qp: use drm_hdmi_acr_get_n_cts() helper for audio N/CTS)
$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next
Auto-merging MAINTAINERS
Auto-merging drivers/accel/amdxdna/amdxdna_gem.c
Auto-merging drivers/accel/ethosu/ethosu_job.c
Auto-merging drivers/dma-buf/dma-buf.c
Auto-merging drivers/gpu/buddy.c
CONFLICT (content): Merge conflict in drivers/gpu/buddy.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_test.c
Auto-merging drivers/gpu/drm/drm_atomic_uapi.c
Auto-merging drivers/gpu/drm/gud/gud_drv.c
Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c
Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h
Auto-merging drivers/gpu/drm/qxl/qxl_display.c
Auto-merging drivers/gpu/drm/tegra/dc.c
Auto-merging drivers/gpu/drm/tiny/cirrus-qemu.c
Auto-merging drivers/gpu/drm/verisilicon/vs_plane.c
Auto-merging drivers/gpu/drm/virtio/virtgpu_display.c
Recorded preimage for 'drivers/gpu/buddy.c'
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
Recorded resolution for 'drivers/gpu/buddy.c'.
[master a550924f3e8ff] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git
$ git diff -M --stat --summary HEAD^..
 .../bindings/display/panel/ilitek,ili7836a.yaml    |   58 +
 .../bindings/display/panel/novatek,nt36532.yaml    |   83 ++
 .../panel/samsung,s6e8aa5x01-ams561ra01.yaml       |    2 +-
 Documentation/gpu/todo.rst                         |   15 -
 MAINTAINERS                                        |   22 +
 drivers/accel/amdxdna/aie2_ctx.c                   |    9 +-
 drivers/accel/amdxdna/amdxdna_gem.c                |  197 ++-
 drivers/accel/amdxdna/amdxdna_gem.h                |    5 +-
 drivers/accel/ethosu/ethosu_job.c                  |    4 +-
 drivers/accel/ivpu/ivpu_drv.h                      |    2 +-
 drivers/accel/qaic/qaic_data.c                     |    8 +-
 drivers/accel/qaic/qaic_debugfs.c                  |    1 +
 drivers/accel/qaic/qaic_drv.c                      |    1 +
 drivers/accel/qaic/qaic_ras.c                      |    1 +
 drivers/accel/qaic/qaic_ssr.c                      |    1 +
 drivers/accel/qaic/qaic_timesync.c                 |    1 +
 drivers/accel/qaic/sahara.c                        |    1 +
 drivers/dma-buf/dma-buf.c                          |    2 +-
 drivers/dma-buf/dma-resv.c                         |    2 +-
 drivers/gpu/buddy.c                                | 1342 ++++++++++++++------
 drivers/gpu/drm/adp/adp_drv.c                      |    2 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |   28 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h  |    7 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c    |   85 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c  |   27 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.h  |    1 +
 .../amd/display/amdgpu_dm/amdgpu_dm_connector.c    |  255 +---
 .../amd/display/amdgpu_dm/tests/amdgpu_dm_test.c   |   16 +-
 drivers/gpu/drm/amd/display/dc/Makefile            |    1 -
 drivers/gpu/drm/amd/display/dc/dc_edid_parser.c    |   80 --
 drivers/gpu/drm/amd/display/dc/dc_edid_parser.h    |   44 -
 drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c      |  121 --
 drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h       |   10 -
 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h    |   71 --
 .../drm/amd/display/modules/color/color_gamma.c    |    3 +-
 .../gpu/drm/arm/display/include/malidp_product.h   |   10 +-
 drivers/gpu/drm/arm/display/komeda/komeda_crtc.c   |   27 +-
 drivers/gpu/drm/arm/display/komeda/komeda_plane.c  |   18 +-
 .../drm/arm/display/komeda/komeda_wb_connector.c   |   33 +
 drivers/gpu/drm/arm/hdlcd_crtc.c                   |    4 +-
 drivers/gpu/drm/arm/malidp_crtc.c                  |   18 +-
 drivers/gpu/drm/arm/malidp_planes.c                |   18 +-
 drivers/gpu/drm/armada/armada_crtc.c               |    2 +-
 drivers/gpu/drm/ast/ast_dp.c                       |   24 +-
 drivers/gpu/drm/ast/ast_mode.c                     |   18 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c     |   19 +-
 drivers/gpu/drm/bridge/Kconfig                     |    7 +-
 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c |    4 +-
 .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c    |    1 -
 drivers/gpu/drm/bridge/chipone-icn6211.c           |    8 +-
 drivers/gpu/drm/bridge/ite-it6505.c                |    4 +-
 drivers/gpu/drm/bridge/lontium-lt9611.c            |    4 +-
 drivers/gpu/drm/bridge/samsung-dsim.c              |    4 +-
 drivers/gpu/drm/bridge/sil-sii8620.c               |    3 +-
 drivers/gpu/drm/bridge/synopsys/dw-dp.c            |    4 +-
 drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c       |  209 +--
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c          |    2 +-
 drivers/gpu/drm/bridge/tc358767.c                  |    4 +-
 drivers/gpu/drm/bridge/ti-sn65dsi83.c              |   45 +-
 drivers/gpu/drm/clients/drm_log.c                  |   54 +-
 drivers/gpu/drm/display/drm_bridge_connector.c     |    3 +
 drivers/gpu/drm/display/drm_hdmi_state_helper.c    |  156 +++
 drivers/gpu/drm/display/drm_scdc_helper.c          |  289 ++++-
 drivers/gpu/drm/drm_atomic.c                       |    4 +
 drivers/gpu/drm/drm_atomic_uapi.c                  |    7 +
 drivers/gpu/drm/drm_buddy.c                        |    3 +-
 drivers/gpu/drm/drm_colorop.c                      |  107 ++
 drivers/gpu/drm/drm_debugfs.c                      |  157 ---
 drivers/gpu/drm/drm_drv.c                          |   29 +-
 drivers/gpu/drm/drm_edid.c                         |  189 ++-
 drivers/gpu/drm/drm_gem.c                          |   14 +-
 drivers/gpu/drm/drm_gem_atomic_helper.c            |   80 +-
 drivers/gpu/drm/drm_of.c                           |   38 +-
 drivers/gpu/drm/drm_simple_kms_helper.c            |   37 +-
 drivers/gpu/drm/exynos/exynos_drm_crtc.c           |    2 +-
 drivers/gpu/drm/exynos/exynos_drm_dpi.c            |    3 +-
 drivers/gpu/drm/exynos/exynos_drm_vidi.c           |    3 +-
 drivers/gpu/drm/exynos/exynos_hdmi.c               |    3 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c         |    2 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c          |   10 +-
 drivers/gpu/drm/gud/gud_drv.c                      |    2 +-
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c     |    2 +-
 drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c       |    9 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c    |    2 +-
 drivers/gpu/drm/hyperv/hyperv_drm.h                |    1 -
 drivers/gpu/drm/hyperv/hyperv_drm_modeset.c        |    2 +-
 drivers/gpu/drm/hyperv/hyperv_drm_proto.c          |   44 +-
 drivers/gpu/drm/imx/dc/dc-crtc.c                   |    2 +-
 drivers/gpu/drm/imx/dc/dc-kms.c                    |    8 +-
 drivers/gpu/drm/imx/dcss/dcss-crtc.c               |    2 +-
 drivers/gpu/drm/imx/dcss/dcss-plane.c              |    2 +-
 drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c             |   18 +-
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c          |    4 +-
 drivers/gpu/drm/ingenic/ingenic-ipu.c              |    2 +-
 drivers/gpu/drm/kmb/kmb_crtc.c                     |    2 +-
 drivers/gpu/drm/kmb/kmb_dsi.c                      |    9 +-
 drivers/gpu/drm/mediatek/mtk_dsi.c                 |   10 +-
 drivers/gpu/drm/meson/meson_crtc.c                 |    2 +-
 drivers/gpu/drm/meson/meson_encoder_cvbs.c         |   11 +-
 drivers/gpu/drm/meson/meson_encoder_dsi.c          |   11 +-
 drivers/gpu/drm/meson/meson_encoder_hdmi.c         |   11 +-
 drivers/gpu/drm/meson/meson_overlay.c              |    2 +-
 drivers/gpu/drm/meson/meson_plane.c                |    2 +-
 drivers/gpu/drm/mgag200/mgag200_drv.h              |    4 +-
 drivers/gpu/drm/mgag200/mgag200_mode.c             |   15 +-
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c           |   18 +-
 drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c          |   18 +-
 drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c          |    2 +-
 drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c         |    2 +-
 drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c          |   20 +-
 drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c         |   16 +-
 drivers/gpu/drm/msm/msm_gem_shrinker.c             |   22 +-
 drivers/gpu/drm/mxsfb/lcdif_kms.c                  |   17 +-
 drivers/gpu/drm/mxsfb/mxsfb_kms.c                  |    4 +-
 drivers/gpu/drm/nouveau/dispnv04/dfp.c             |    5 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c            |    4 +-
 drivers/gpu/drm/nouveau/dispnv50/head.c            |   14 +-
 drivers/gpu/drm/nouveau/dispnv50/headca7d.c        |   21 +-
 .../gpu/drm/nouveau/include/nvhw/class/clca7d.h    |    4 +
 drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h  |    1 +
 drivers/gpu/drm/nouveau/nouveau_abi16.c            |    4 +
 drivers/gpu/drm/nouveau/nouveau_acpi.c             |   32 +-
 drivers/gpu/drm/nouveau/nouveau_acpi.h             |   10 +-
 drivers/gpu/drm/nouveau/nouveau_connector.c        |  151 ++-
 drivers/gpu/drm/nouveau/nouveau_connector.h        |   12 +-
 drivers/gpu/drm/nouveau/nouveau_dp.c               |    4 +-
 drivers/gpu/drm/nouveau/nouveau_drm.c              |  114 +-
 drivers/gpu/drm/nouveau/nouveau_fence.c            |    2 +-
 drivers/gpu/drm/nouveau/nouveau_svm.c              |   13 +
 drivers/gpu/drm/nouveau/nvkm/engine/device/base.c  |    2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.h    |    4 +-
 .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fbsr.c |    2 +-
 .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c  |    8 +-
 .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/fbsr.c |    8 +-
 .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c  |    3 +-
 .../drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/gsp.h |    8 +
 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h    |    2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/pci/Kbuild     |    1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/pci/mcp79.c    |   35 +
 drivers/gpu/drm/omapdrm/dss/dsi.c                  |   63 +-
 drivers/gpu/drm/omapdrm/dss/hdmi.h                 |    6 +
 drivers/gpu/drm/omapdrm/dss/hdmi4.c                |   29 +-
 drivers/gpu/drm/omapdrm/dss/hdmi5.c                |   37 +-
 drivers/gpu/drm/omapdrm/dss/hdmi_common.c          |   14 +
 drivers/gpu/drm/omapdrm/omap_crtc.c                |   17 +-
 drivers/gpu/drm/panel/Kconfig                      |   25 +
 drivers/gpu/drm/panel/Makefile                     |    2 +
 drivers/gpu/drm/panel/panel-edp.c                  |    3 +
 drivers/gpu/drm/panel/panel-himax-hx83102.c        |   24 +-
 drivers/gpu/drm/panel/panel-himax-hx83112a.c       |   26 +-
 drivers/gpu/drm/panel/panel-himax-hx83112b.c       |   23 +-
 drivers/gpu/drm/panel/panel-himax-hx8394.c         |   26 +-
 drivers/gpu/drm/panel/panel-ilitek-ili7836a.c      |  297 +++++
 drivers/gpu/drm/panel/panel-ilitek-ili9805.c       |   21 +-
 drivers/gpu/drm/panel/panel-ilitek-ili9806e-core.c |   12 +-
 drivers/gpu/drm/panel/panel-ilitek-ili9806e-core.h |    1 -
 drivers/gpu/drm/panel/panel-ilitek-ili9806e-dsi.c  |   16 +-
 drivers/gpu/drm/panel/panel-ilitek-ili9806e-spi.c  |    6 -
 drivers/gpu/drm/panel/panel-ilitek-ili9881c.c      |   15 +-
 drivers/gpu/drm/panel/panel-ilitek-ili9882t.c      |   24 +-
 drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c       |   19 +-
 drivers/gpu/drm/panel/panel-jdi-lt070me05000.c     |   32 +-
 drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c |   20 +-
 drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c |   20 +-
 drivers/gpu/drm/panel/panel-novatek-nt36532.c      |  431 +++++++
 drivers/gpu/drm/panel/panel-samsung-s6d16d0.c      |   74 +-
 drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c      |   20 +-
 drivers/gpu/drm/panel/panel-samsung-s6e3fa7.c      |   20 +-
 drivers/gpu/drm/panel/panel-samsung-s6e3fc2x01.c   |   20 +-
 drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c      |   30 +-
 drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c      |   20 +-
 drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c   |   31 +-
 drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c  |   13 +-
 drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c  |    6 -
 drivers/gpu/drm/panel/panel-samsung-s6e63m0.c      |   12 +-
 drivers/gpu/drm/panel/panel-samsung-s6e63m0.h      |    1 -
 .../drm/panel/panel-samsung-s6e88a0-ams427ap24.c   |   20 +-
 .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c   |   20 +-
 drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c      |   19 +-
 .../gpu/drm/panel/panel-samsung-s6e8fc0-m1906f9.c  |   23 +-
 drivers/gpu/drm/panel/panel-samsung-sofef00.c      |   20 +-
 drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c    |   31 +-
 drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c    |   20 +-
 drivers/gpu/drm/panel/panel-sony-td4353-jdi.c      |   20 +-
 .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c |   20 +-
 drivers/gpu/drm/panel/panel-visionox-r66451.c      |   23 +-
 drivers/gpu/drm/panel/panel-visionox-rm69299.c     |   21 +-
 drivers/gpu/drm/panfrost/panfrost_devfreq.c        |    2 +-
 drivers/gpu/drm/panfrost/panfrost_device.c         |    1 -
 drivers/gpu/drm/panfrost/panfrost_drv.c            |    2 +-
 drivers/gpu/drm/panthor/panthor_device.h           |  286 ++---
 drivers/gpu/drm/panthor/panthor_fw.c               |   22 +-
 drivers/gpu/drm/panthor/panthor_gem.c              |   14 +-
 drivers/gpu/drm/panthor/panthor_gpu.c              |  117 +-
 drivers/gpu/drm/panthor/panthor_mmu.c              |   44 +-
 drivers/gpu/drm/panthor/panthor_mmu.h              |    3 +-
 drivers/gpu/drm/panthor/panthor_pwr.c              |   24 +-
 drivers/gpu/drm/panthor/panthor_sched.c            |  518 ++++----
 drivers/gpu/drm/panthor/panthor_trace.h            |   38 +
 drivers/gpu/drm/qxl/qxl_display.c                  |    2 +-
 drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.c     |   17 +-
 drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c      |   15 +-
 drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c  |   12 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c        |   18 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c       |   18 +-
 drivers/gpu/drm/scheduler/sched_entity.c           |   10 +-
 drivers/gpu/drm/scheduler/tests/tests_basic.c      |    2 +-
 drivers/gpu/drm/sitronix/st7571.c                  |    2 +-
 drivers/gpu/drm/sitronix/st7920.c                  |   12 +-
 drivers/gpu/drm/solomon/ssd130x.c                  |   22 +-
 drivers/gpu/drm/sprd/sprd_dpu.c                    |    2 +-
 drivers/gpu/drm/sti/sti_crtc.c                     |    2 +-
 drivers/gpu/drm/stm/ltdc.c                         |    4 +-
 drivers/gpu/drm/sun4i/sun4i_crtc.c                 |    2 +-
 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c             |    1 +
 drivers/gpu/drm/sun4i/sun8i_ui_layer.c             |    2 +-
 drivers/gpu/drm/sun4i/sun8i_vi_layer.c             |    2 +-
 drivers/gpu/drm/sysfb/drm_sysfb_helper.h           |    8 +-
 drivers/gpu/drm/sysfb/drm_sysfb_modeset.c          |   64 +-
 drivers/gpu/drm/tegra/dc.c                         |   18 +-
 drivers/gpu/drm/tegra/dsi.c                        |   16 +-
 drivers/gpu/drm/tegra/plane.c                      |   28 +-
 drivers/gpu/drm/tegra/rgb.c                        |   15 +-
 drivers/gpu/drm/tests/drm_kunit_helpers.c          |    2 +-
 drivers/gpu/drm/tidss/tidss_dispc.c                |   38 +-
 drivers/gpu/drm/tidss/tidss_dispc.h                |    2 +-
 drivers/gpu/drm/tidss/tidss_encoder.c              |   10 +-
 drivers/gpu/drm/tiny/appletbdrm.c                  |   14 +-
 drivers/gpu/drm/tiny/bochs.c                       |    2 +-
 drivers/gpu/drm/tiny/cirrus-qemu.c                 |    2 +-
 drivers/gpu/drm/tiny/pixpaper.c                    |    2 +-
 drivers/gpu/drm/tiny/sharp-memory.c                |    2 +-
 drivers/gpu/drm/ttm/ttm_bo.c                       |    3 +-
 drivers/gpu/drm/udl/udl_modeset.c                  |    2 +-
 drivers/gpu/drm/vboxvideo/vbox_mode.c              |    2 +-
 drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c          |    2 +-
 drivers/gpu/drm/vc4/vc4_crtc.c                     |   14 +-
 drivers/gpu/drm/vc4/vc4_drv.h                      |    2 +-
 drivers/gpu/drm/vc4/vc4_hdmi.c                     |    1 +
 drivers/gpu/drm/vc4/vc4_plane.c                    |   15 +-
 drivers/gpu/drm/vc4/vc4_txp.c                      |    2 +-
 drivers/gpu/drm/verisilicon/vs_crtc.c              |    2 +-
 drivers/gpu/drm/verisilicon/vs_cursor_plane.c      |    8 +-
 drivers/gpu/drm/verisilicon/vs_plane.c             |   20 -
 drivers/gpu/drm/verisilicon/vs_plane.h             |    2 -
 drivers/gpu/drm/verisilicon/vs_primary_plane.c     |    7 +-
 drivers/gpu/drm/virtio/virtgpu_display.c           |   14 +-
 drivers/gpu/drm/vkms/tests/gen_yuv_conversion.py   |   87 ++
 drivers/gpu/drm/vkms/tests/vkms_format_test.c      |   40 +-
 drivers/gpu/drm/vkms/vkms_colorop.c                |   66 +-
 drivers/gpu/drm/vkms/vkms_composer.c               |    6 +
 drivers/gpu/drm/vkms/vkms_crtc.c                   |   18 +-
 drivers/gpu/drm/vkms/vkms_formats.c                |   64 +-
 drivers/gpu/drm/vkms/vkms_formats.h                |    2 +-
 drivers/gpu/drm/vkms/vkms_plane.c                  |   55 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |   22 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h                |    2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c                |    2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c               |    2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c               |    2 +-
 drivers/gpu/drm/xlnx/zynqmp_kms.c                  |   16 +-
 drivers/gpu/tests/gpu_buddy_test.c                 |  160 ++-
 include/drm/display/drm_dp.h                       |    1 +
 include/drm/display/drm_hdmi_state_helper.h        |    3 +
 include/drm/display/drm_scdc.h                     |   21 +-
 include/drm/display/drm_scdc_helper.h              |  103 +-
 include/drm/drm_colorop.h                          |  127 ++
 include/drm/drm_connector.h                        |   69 +-
 include/drm/drm_gem.h                              |    3 +-
 include/drm/drm_gem_atomic_helper.h                |   11 +-
 include/drm/drm_mipi_dbi.h                         |    2 +-
 include/drm/drm_print.h                            |    3 +
 include/drm/drm_simple_kms_helper.h                |    6 +-
 include/linux/gpu_buddy.h                          |  101 +-
 include/sound/omap-hdmi-audio.h                    |    1 +
 include/uapi/drm/drm_mode.h                        |   12 +
 kernel/cgroup/dmem.c                               |    4 +-
 sound/soc/ti/omap-hdmi.c                           |   52 +-
 278 files changed, 5676 insertions(+), 3565 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili7836a.yaml
 create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt36532.yaml
 delete mode 100644 drivers/gpu/drm/amd/display/dc/dc_edid_parser.c
 delete mode 100644 drivers/gpu/drm/amd/display/dc/dc_edid_parser.h
 create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/pci/mcp79.c
 create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili7836a.c
 create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt36532.c
 create mode 100755 drivers/gpu/drm/vkms/tests/gen_yuv_conversion.py
$ git am -3 ../patches/0001-drm-bridge-microchip-lvds-Rename-drm_atomic_state-to.patch
Applying: drm/bridge: microchip-lvds: Rename drm_atomic_state to drm_atomic_commit
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/bridge/microchip-lvds.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/bridge/microchip-lvds.c
No changes -- Patch already applied.
$ git reset --hard HEAD^
HEAD is now at 1ad3cd85b97e4 Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
Merging next-20260831 version of drm-misc
$ git merge -m next-20260831/drm-misc 271e90eb5f9ff34951647e5ed33c1775eebcca50
Already up to date.
$ git am -3 ../patches/0001-drm-bridge-microchip-lvds-Rename-drm_atomic_state-to.patch
Applying: drm/bridge: microchip-lvds: Rename drm_atomic_state to drm_atomic_commit
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/bridge/microchip-lvds.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/bridge/microchip-lvds.c
No changes -- Patch already applied.
Merging amdgpu/drm-next (4f9ab6eb25943 Documentation: add initial UALink Documentation)
$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git amdgpu/drm-next
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.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_gem.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_test.c
Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr.c
Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c
Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_resource.c
Auto-merging drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_shared_types.h
Auto-merging drivers/gpu/drm/amd/display/dc/dml2_wrapper/dml2_translation_helper.c
Auto-merging drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c
Auto-merging drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
Auto-merging drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c
Auto-merging drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c
Auto-merging drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c
Auto-merging drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c
Auto-merging drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c
Auto-merging drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c
Auto-merging drivers/gpu/drm/amd/display/dc/resource/dcn60/dcn60_resource.c
Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c
Auto-merging drivers/gpu/drm/amd/ras/core/cmd.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/ras/core/cmd.c
Auto-merging drivers/gpu/drm/drm_gem.c
Auto-merging include/uapi/drm/amdgpu_drm.h
Recorded preimage for 'drivers/gpu/drm/amd/ras/core/cmd.c'
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
Recorded resolution for 'drivers/gpu/drm/amd/ras/core/cmd.c'.
[master 32fb9dbc89791] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git
$ git diff -M --stat --summary HEAD^..
 Documentation/gpu/amdgpu/index.rst                 |     1 +
 Documentation/gpu/amdgpu/ualink.rst                |    75 +
 drivers/gpu/drm/amd/amdgpu/Makefile                |     5 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |    10 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c            |     6 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c         |     2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c |     3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.h |     3 +-
 .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12_1.c   |    36 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c  |     3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h  |     3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   |     2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |     2 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c        |    14 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c   |     8 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |    15 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c      |   337 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h      |    13 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c        |     5 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |    31 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |     9 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h            |     4 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c            |    15 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h            |     3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c             |   124 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c            |    33 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h            |    27 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h             |     2 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h            |     1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ip.c             |     1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c            |    35 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h            |    11 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c            |     6 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_job.c            |     5 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c           |    38 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h           |     2 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |    11 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_lsdma.c          |    20 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_lsdma.h          |     4 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c            |     6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c            |    99 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h            |    11 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h          |     3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |    11 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.h         |     5 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c            |   587 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h            |    86 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c            |   105 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h            |     3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c     |     8 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h     |     1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c          |     7 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h           |     3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h           |     1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h          |    12 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c   |     1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |    58 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h            |     4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c         |  6267 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.h         |   427 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c            |    46 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h            |     8 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c          |    32 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c    |    68 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c           |    39 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h           |     2 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c           |     6 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |    52 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h             |   122 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c         |     1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_internal.h    |   155 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c          |    35 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c        |     6 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c   |     4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c            |    34 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c            |    11 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h            |     7 +
 drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h        |    49 +-
 drivers/gpu/drm/amd/amdgpu/cik.c                   |     7 -
 drivers/gpu/drm/amd/amdgpu/cik_ih.c                |    12 -
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c              |    35 +-
 drivers/gpu/drm/amd/amdgpu/cz_ih.c                 |    12 -
 drivers/gpu/drm/amd/amdgpu/dce_v10_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             |    44 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c             |    44 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c             |    44 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c             |   307 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h         |    39 -
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c              |    26 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c              |    39 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c              |   146 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c              |   146 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c            |    28 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c            |    33 +-
 drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.c        |     9 +-
 drivers/gpu/drm/amd/amdgpu/gfxhub_v12_0.c          |     9 +-
 drivers/gpu/drm/amd/amdgpu/gfxhub_v12_1.c          |    41 +-
 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c           |     9 +-
 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c           |     2 +
 drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c           |     9 +-
 drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c           |     9 +-
 drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c           |     9 +-
 drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c         |     9 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c             |    11 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c             |    17 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c             |    59 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c             |   175 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v12_1.h             |     2 +
 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c              |     7 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c              |     7 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c              |    19 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c              |    13 +-
 drivers/gpu/drm/amd/amdgpu/iceland_ih.c            |    12 -
 drivers/gpu/drm/amd/amdgpu/ih_v6_0.c               |    39 +-
 drivers/gpu/drm/amd/amdgpu/ih_v6_1.c               |    16 +-
 drivers/gpu/drm/amd/amdgpu/ih_v7_0.c               |    43 +-
 drivers/gpu/drm/amd/amdgpu/imu_v12_1.c             |    91 +-
 drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c             |     1 -
 drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c             |     2 -
 drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c             |     1 -
 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c             |     1 -
 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c           |     1 -
 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c           |     1 -
 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c           |     1 -
 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c           |     3 +-
 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.h           |     8 -
 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_2.c           |   265 +-
 drivers/gpu/drm/amd/amdgpu/jpeg_v5_3_0.c           |     1 -
 drivers/gpu/drm/amd/amdgpu/lsdma_v7_1.c            |    27 +-
 drivers/gpu/drm/amd/amdgpu/mes_userqueue.c         |    12 +-
 drivers/gpu/drm/amd/amdgpu/mes_v11_0.c             |    20 +-
 drivers/gpu/drm/amd/amdgpu/mes_v12_1.c             |    75 +-
 drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.c          |   372 +-
 drivers/gpu/drm/amd/amdgpu/navi10_ih.c             |    11 +-
 drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c           |   155 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c             |     2 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v6_3_2.c           |    18 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v7_11_5.c          |   351 +
 drivers/gpu/drm/amd/amdgpu/nbio_v7_11_5.h          |    32 +
 drivers/gpu/drm/amd/amdgpu/nv.c                    |     6 -
 drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h            |   162 +
 drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.c           |   146 +
 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c             |    50 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c             |    50 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c             |    53 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c           |    53 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c             |    52 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c             |    51 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c             |    51 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c             |    51 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c             |    80 +-
 drivers/gpu/drm/amd/amdgpu/si.c                    |     6 -
 drivers/gpu/drm/amd/amdgpu/si_dma.c                |    31 +-
 drivers/gpu/drm/amd/amdgpu/si_ih.c                 |     1 -
 drivers/gpu/drm/amd/amdgpu/soc15.c                 |     6 -
 drivers/gpu/drm/amd/amdgpu/soc21.c                 |     6 -
 drivers/gpu/drm/amd/amdgpu/soc24.c                 |     6 -
 drivers/gpu/drm/amd/amdgpu/soc_v1_0.c              |   482 +-
 drivers/gpu/drm/amd/amdgpu/soc_v1_0.h              |     3 +
 drivers/gpu/drm/amd/amdgpu/ta_ras_if.h             |     1 +
 drivers/gpu/drm/amd/amdgpu/tonga_ih.c              |    12 -
 drivers/gpu/drm/amd/amdgpu/ualink_v1_0.c           |   143 +
 drivers/gpu/drm/amd/amdgpu/ualink_v1_0.h           |    30 +
 drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c              |     8 -
 drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c              |     8 -
 drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c              |     8 -
 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c              |     1 -
 drivers/gpu/drm/amd/amdgpu/vce_v1_0.c              |     1 -
 drivers/gpu/drm/amd/amdgpu/vce_v2_0.c              |     1 -
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c              |     1 -
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c              |     3 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c              |     1 -
 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c              |     2 -
 drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c              |    16 -
 drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c              |    23 -
 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c            |    21 -
 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c            |    23 -
 drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c            |    23 -
 drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c            |    19 -
 drivers/gpu/drm/amd/amdgpu/vcn_v5_0_2.c            |   351 +-
 drivers/gpu/drm/amd/amdgpu/vega10_ih.c             |     7 -
 drivers/gpu/drm/amd/amdgpu/vega20_ih.c             |     7 -
 drivers/gpu/drm/amd/amdgpu/vi.c                    |     6 -
 drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h     |  1290 +-
 .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm |   135 +-
 drivers/gpu/drm/amd/amdkfd/kfd_device.c            |     7 +-
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |    86 +-
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h  |     1 +
 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c           |    51 +-
 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c |    30 +-
 drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c |     3 +-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c           |    44 +-
 .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c |     3 +-
 drivers/gpu/drm/amd/amdkfd/kfd_queue.c             |    10 +-
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c               |     7 +-
 drivers/gpu/drm/amd/display/Kconfig                |     9 +
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |   200 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h  |    88 +-
 .../amd/display/amdgpu_dm/amdgpu_dm_backlight.c    |    33 +-
 .../amd/display/amdgpu_dm/amdgpu_dm_backlight.h    |     1 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c  |   110 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.h  |    28 +
 .../amd/display/amdgpu_dm/amdgpu_dm_connector.c    |   101 +-
 .../amd/display/amdgpu_dm/amdgpu_dm_connector.h    |     7 +
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c |    50 +-
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.h |     7 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_cursor.c   |    63 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_cursor.h   |     6 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c  |    88 +
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c |    47 +-
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.h |    15 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c |    47 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c  |    32 +
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c  |     3 +
 .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c    |    12 +-
 .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h    |     4 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c    |    48 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h    |    12 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c |    35 +-
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c   |    72 +-
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h   |    16 +
 .../gpu/drm/amd/display/amdgpu_dm/tests/Makefile   |     4 +-
 .../amdgpu_dm/tests/amdgpu_dm_backlight_test.c     |    53 +-
 .../amdgpu_dm/tests/amdgpu_dm_colorop_test.c       |   232 +-
 .../amdgpu_dm/tests/amdgpu_dm_connector_test.c     |  3067 +
 .../display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c  |   746 +
 .../amdgpu_dm/tests/amdgpu_dm_cursor_test.c        |   732 +
 .../display/amdgpu_dm/tests/amdgpu_dm_dmub_test.c  |   578 +-
 .../amdgpu_dm/tests/amdgpu_dm_freesync_test.c      |   407 +
 .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c       |   879 +-
 .../display/amdgpu_dm/tests/amdgpu_dm_irq_test.c   |  1255 +-
 .../display/amdgpu_dm/tests/amdgpu_dm_ism_test.c   |   367 +-
 .../amdgpu_dm/tests/amdgpu_dm_mst_types_test.c     |   741 +
 .../display/amdgpu_dm/tests/amdgpu_dm_plane_test.c |   703 +-
 .../amdgpu_dm/tests/amdgpu_dm_services_test.c      |   228 +-
 .../amd/display/amdgpu_dm/tests/amdgpu_dm_test.c   |  3562 +-
 .../display/amdgpu_dm/tests/amdgpu_dm_wb_test.c    |   330 +
 drivers/gpu/drm/amd/display/dc/Makefile            |     1 +
 .../drm/amd/display/dc/bios/command_table_helper.c |     7 +-
 .../amd/display/dc/bios/command_table_helper2.c    |     2 +
 drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile    |     8 +
 drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c   |     4 +
 .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c |    12 +-
 .../amd/display/dc/clk_mgr/dcn10/dcn10_clk_mgr.c   |   181 +
 .../amd/display/dc/clk_mgr/dcn10/dcn10_clk_mgr.h   |    29 +
 .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c |     9 +-
 .../drm/amd/display/dc/clk_mgr/dcn10/rv2_clk_mgr.c |     6 +-
 .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c   |    12 +-
 .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c |     6 +-
 .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c  |     5 +-
 .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c   |     8 +-
 .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c |     8 +-
 .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c   |    10 +-
 .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c |    10 +-
 .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c |    14 +-
 .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c |    10 +-
 .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c   |    18 +-
 .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c   |    12 +-
 .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c |    18 +-
 .../amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c   |    26 +-
 .../amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.h   |     5 +
 .../amd/display/dc/clk_mgr/dcn42b/dcn42b_clk_mgr.c |    41 +-
 .../gpu/drm/amd/display/dc/clk_mgr/dcn60/dalsmc.h  |   344 +-
 .../amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr.c   |   127 +-
 .../amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr.h   |    17 +-
 .../dc/clk_mgr/dcn60/dcn60_clk_mgr_smu_msg.c       |   214 +-
 .../dc/clk_mgr/dcn60/dcn60_clk_mgr_smu_msg.h       |   167 +-
 .../display/dc/clk_mgr/dcn60/dcn60_smu_driver_if.h |    76 +
 drivers/gpu/drm/amd/display/dc/core/dc.c           |    29 +-
 .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c  |   402 +-
 .../gpu/drm/amd/display/dc/core/dc_link_exports.c  |    25 +-
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |    88 +-
 drivers/gpu/drm/amd/display/dc/core/dc_state.c     |     4 +-
 drivers/gpu/drm/amd/display/dc/dc.h                |    16 +-
 drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c       |    72 +-
 drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h       |    39 +
 drivers/gpu/drm/amd/display/dc/dc_hw_types.h       |    18 +-
 drivers/gpu/drm/amd/display/dc/dc_types.h          |     4 +-
 drivers/gpu/drm/amd/display/dc/dce/dce_aux.c       |    12 +-
 .../amd/display/dc/dio/dcn10/dcn10_link_encoder.c  |    10 +-
 .../display/dc/dio/dcn42/dcn42_dio_link_encoder.c  |     4 +-
 .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c   |    18 +-
 .../amd/display/dc/dml/dcn30/display_mode_vba_30.c |     2 +-
 .../amd/display/dc/dml/dcn31/display_mode_vba_31.c |     2 +-
 .../gpu/drm/amd/display/dc/dml/dml1_frl_cap_chk.c  |     8 +-
 drivers/gpu/drm/amd/display/dc/dml2_0/Makefile     |    16 +-
 .../amd/display/dc/dml2_0/dml21/dml21_wrapper.h    |   106 -
 .../dml2_0/dml21/inc/bounding_boxes/dcn42_soc_bb.h |    39 +-
 .../dml21/inc/bounding_boxes/dcn42b_soc_bb.h       |    35 +-
 .../dml2_0/dml21/inc/bounding_boxes/dcn4_soc_bb.h  |    27 +-
 .../dml2_0/dml21/inc/dml_top_display_cfg_types.h   |     1 +
 .../dml2_0/dml21/inc/dml_top_soc_parameter_types.h |    26 +-
 .../display/dc/dml2_0/dml21/inc/dml_top_types.h    |     1 +
 .../dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn4.c |     4 +
 .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c     |   210 +-
 .../dml21/src/dml2_core/dml2_core_dcn4_calcs.h     |     1 +
 .../src/dml2_core/dml2_core_dcn5_calcs_dchub.c     |    10 +-
 .../dml2_core/dml2_core_dcn5_funcs_initialize.c    |     2 +-
 .../dml2_core/dml2_core_dcn5_funcs_mode_support.c  |    28 +-
 .../src/dml2_core/dml2_core_dcn6_calcs_dchub.c     |    51 +-
 .../dml2_core/dml2_core_dcn6_funcs_initialize.c    |     2 +
 .../dml2_core/dml2_core_dcn6_funcs_mode_support.c  |    38 +-
 .../dml21/src/dml2_core/dml2_core_shared_types.h   |     7 +
 .../dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c |   106 +-
 .../dc/dml2_0/dml21/src/dml2_top/dml2_top_utm.c    |     2 +-
 .../dml21/src/inc/dml2_internal_shared_types.h     |     1 +
 .../gpu/drm/amd/display/dc/dml2_wrapper/Makefile   |    61 +
 .../dml21_wrapper}/dml21_translation_helper.c      |    45 +-
 .../dml21_wrapper}/dml21_translation_helper.h      |     7 +-
 .../dml21_wrapper}/dml21_utils.c                   |    24 +-
 .../dml21_wrapper}/dml21_utils.h                   |     7 +-
 .../dml21_wrapper}/dml21_wrapper.c                 |     2 +-
 .../dc/dml2_wrapper/dml21_wrapper/dml21_wrapper.h  |   107 +
 .../dml21_wrapper}/dml21_wrapper_fpu.c             |    19 +-
 .../dml21_wrapper}/dml21_wrapper_fpu.h             |     7 +-
 .../dml2_dc_resource_mgmt.c                        |    60 +-
 .../dml2_dc_resource_mgmt.h                        |     0
 .../dc/{dml2_0 => dml2_wrapper}/dml2_dc_types.h    |     0
 .../{dml2_0 => dml2_wrapper}/dml2_internal_types.h |     2 +-
 .../{dml2_0 => dml2_wrapper}/dml2_mall_phantom.c   |    70 +-
 .../{dml2_0 => dml2_wrapper}/dml2_mall_phantom.h   |     0
 .../dc/{dml2_0 => dml2_wrapper}/dml2_policy.c      |     2 +-
 .../dc/{dml2_0 => dml2_wrapper}/dml2_policy.h      |     0
 .../dml2_translation_helper.c                      |    20 +-
 .../dml2_translation_helper.h                      |     0
 .../dc/{dml2_0 => dml2_wrapper}/dml2_utils.c       |    28 +-
 .../dc/{dml2_0 => dml2_wrapper}/dml2_utils.h       |     0
 .../dc/{dml2_0 => dml2_wrapper}/dml2_wrapper.c     |     6 +-
 .../dc/{dml2_0 => dml2_wrapper}/dml2_wrapper.h     |     0
 .../dc/{dml2_0 => dml2_wrapper}/dml2_wrapper_fpu.c |    45 +-
 .../dc/{dml2_0 => dml2_wrapper}/dml2_wrapper_fpu.h |     0
 .../gpu/drm/amd/display/dc/dpp/dcn50/dcn50_dpp.h   |    11 +-
 .../gpu/drm/amd/display/dc/dpp/dcn60/dcn60_dpp.h   |     7 +-
 drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c        |     8 +
 .../gpu/drm/amd/display/dc/dsc/dcn60/dcn60_dsc.c   |     4 +-
 drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c       |     7 +-
 drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c   |     4 +
 drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c |     4 +
 .../dc/hpo/dcn60/dcn60_hpo_frl_stream_encoder.c    |   131 +-
 .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.h |    11 +-
 .../drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c |     7 +
 .../drm/amd/display/dc/hubbub/dcn60/dcn60_hubbub.c |   206 +-
 .../drm/amd/display/dc/hubbub/dcn60/dcn60_hubbub.h |    19 +-
 .../gpu/drm/amd/display/dc/hubp/dcn21/dcn21_hubp.c |     6 +-
 .../gpu/drm/amd/display/dc/hubp/dcn21/dcn21_hubp.h |     2 +-
 .../gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c |     2 +-
 .../gpu/drm/amd/display/dc/hubp/dcn60/dcn60_hubp.c |     3 +
 drivers/gpu/drm/amd/display/dc/hwss/Makefile       |     6 +
 .../gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.c    |    46 +-
 .../gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.h    |    12 +-
 .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c  |    25 +-
 .../drm/amd/display/dc/hwss/dce60/dce60_hwseq.c    |     8 +-
 .../drm/amd/display/dc/hwss/dce80/dce80_hwseq.c    |     3 +-
 .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c    |   152 +-
 .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.h    |    13 +-
 .../gpu/drm/amd/display/dc/hwss/dcn10/dcn10_init.c |     4 +-
 .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c    |   237 +-
 .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.h    |    21 +-
 .../gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.c |     3 +-
 .../drm/amd/display/dc/hwss/dcn201/dcn201_hwseq.c  |    34 +-
 .../drm/amd/display/dc/hwss/dcn201/dcn201_hwseq.h  |     5 +-
 .../drm/amd/display/dc/hwss/dcn201/dcn201_init.c   |     4 +-
 .../gpu/drm/amd/display/dc/hwss/dcn21/dcn21_init.c |     3 +-
 .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c    |    57 +-
 .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h    |     8 +-
 .../gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c |     3 +-
 .../drm/amd/display/dc/hwss/dcn301/dcn301_init.c   |     3 +-
 .../gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c |     3 +-
 .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c  |     8 +-
 .../drm/amd/display/dc/hwss/dcn314/dcn314_init.c   |     3 +-
 .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c    |    71 +-
 .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.h    |    10 +-
 .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c |     3 +-
 .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c |     3 +-
 .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c   |     3 +-
 .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c  |   204 +-
 .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h  |    12 +-
 .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c   |     3 +-
 .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.c    |    49 +-
 .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.h    |    12 +-
 .../gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.c |     3 +-
 .../drm/amd/display/dc/hwss/dcn50/dcn50_hwseq.c    |     3 +-
 .../drm/amd/display/dc/hwss/dcn60/dcn60_hwseq.c    |    24 +-
 .../gpu/drm/amd/display/dc/hwss/dcn60/dcn60_init.c |     3 +-
 drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h |    89 +-
 .../drm/amd/display/dc/hwss/hw_sequencer_private.h |    21 +-
 drivers/gpu/drm/amd/display/dc/inc/custom_float.h  |    21 +-
 drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h   |     1 +
 drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h  |    10 -
 drivers/gpu/drm/amd/display/dc/inc/hw/opp.h        |    14 +-
 drivers/gpu/drm/amd/display/dc/inc/link_service.h  |     7 +-
 drivers/gpu/drm/amd/display/dc/irq/Makefile        |     2 +
 .../amd/display/dc/irq/dce110/irq_service_dce110.c |    21 -
 .../amd/display/dc/irq/dce110/irq_service_dce110.h |     9 -
 drivers/gpu/drm/amd/display/dc/irq/irq_service.c   |    28 +
 drivers/gpu/drm/amd/display/dc/irq/irq_service.h   |     9 +
 .../amd/display/dc/link/hwss/link_hwss_hpo_dp.c    |    23 +-
 .../gpu/drm/amd/display/dc/link/link_detection.c   |     4 +-
 drivers/gpu/drm/amd/display/dc/link/link_factory.c |     6 +-
 .../display/dc/link/protocols/link_dp_capability.c |     3 +-
 .../dc/link/protocols/link_dp_panel_replay.c       |    36 +-
 .../dc/link/protocols/link_dp_panel_replay.h       |     2 +-
 .../dc/link/protocols/link_edp_panel_control.c     |    81 +-
 .../dc/link/protocols/link_edp_panel_control.h     |     4 +
 .../amd/display/dc/link/protocols/link_hdmi_frl.c  |    32 +-
 drivers/gpu/drm/amd/display/dc/os_types.h          |    18 +
 drivers/gpu/drm/amd/display/dc/resource/Makefile   |     4 +
 .../display/dc/resource/dce112/dce112_resource.c   |    62 -
 .../amd/display/dc/resource/dcn32/dcn32_resource.c |     2 +-
 .../amd/display/dc/resource/dcn35/dcn35_resource.c |     2 +-
 .../display/dc/resource/dcn351/dcn351_resource.c   |     2 +-
 .../amd/display/dc/resource/dcn36/dcn36_resource.c |     2 +-
 .../display/dc/resource/dcn401/dcn401_resource.c   |     2 +-
 .../amd/display/dc/resource/dcn42/dcn42_resource.c |     6 +-
 .../display/dc/resource/dcn42b/dcn42b_resource.c   |     6 +-
 .../amd/display/dc/resource/dcn60/dcn60_resource.c |    17 +-
 .../amd/display/dc/resource/dcn60/dcn60_resource.h |     9 +-
 .../dcn401/dcn401_soc_and_ip_translator.c          |     6 +-
 .../dcn60/dcn60_soc_and_ip_translator.c            |     6 +-
 drivers/gpu/drm/amd/display/dc/sspl/Makefile       |     5 +-
 drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c       |   130 +-
 .../amd/display/dc/sspl/dc_spl_isharp_filters.c    |    10 +-
 .../amd/display/dc/sspl/dc_spl_scl_easf_filters.c  |    88 +-
 .../drm/amd/display/dc/sspl/dc_spl_scl_filters.c   |    24 +-
 drivers/gpu/drm/amd/display/dc/sspl/dc_spl_types.h |    60 +-
 .../gpu/drm/amd/display/dc/sspl/spl_custom_float.c |   152 -
 .../gpu/drm/amd/display/dc/sspl/spl_custom_float.h |    29 -
 .../gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.c   |   495 -
 .../gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.h   |   526 -
 .../gpu/drm/amd/display/dc/sspl/spl_namespace.h    |    17 +
 drivers/gpu/drm/amd/display/dc/sspl/spl_os_types.h |    43 +-
 drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h    |    39 +
 drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c    |     2 +-
 drivers/gpu/drm/amd/display/include/dal_asic_id.h  |     5 +
 .../drm/amd/display/modules/inc/mod_info_packet.h  |     4 +
 .../gpu/drm/amd/display/modules/inc/mod_power.h    |     1 +
 .../amd/display/modules/info_packet/info_packet.c  |   109 +
 drivers/gpu/drm/amd/include/amd_shared.h           |     6 +-
 .../drm/amd/include/asic_reg/gc/gc_12_1_0_offset.h |     2 +
 .../amd/include/asic_reg/gc/gc_12_1_0_sh_mask.h    |     4 +-
 .../amd/include/asic_reg/nbio/nbio_7_11_5_offset.h | 11074 ++++
 .../include/asic_reg/nbio/nbio_7_11_5_sh_mask.h    | 63248 +++++++++++++++++++
 drivers/gpu/drm/amd/include/discovery.h            |   179 +-
 .../amd/include/ivsrcid/mpnht/irqsrcs_mpnht_15_0.h |    30 +
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h    |     3 +-
 drivers/gpu/drm/amd/include/v12_structs.h          |     2 +-
 drivers/gpu/drm/amd/pm/amdgpu_dpm.c                |     3 -
 drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c         |     6 -
 drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c         |     7 -
 drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c   |     6 -
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c          |    30 +-
 drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h      |    15 +-
 .../pm/swsmu/inc/pmfw_if/smu15_driver_if_v15_0_0.h |    46 -
 drivers/gpu/drm/amd/pm/swsmu/inc/smu_v15_0.h       |     6 -
 .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c   |     7 +-
 drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c     |   166 -
 .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_0_ppt.c   |   270 +-
 .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c   |    11 +-
 drivers/gpu/drm/amd/ras/core/Makefile              |     9 +-
 drivers/gpu/drm/amd/ras/core/aca.c                 |   353 +-
 drivers/gpu/drm/amd/ras/core/aca.h                 |    44 +-
 drivers/gpu/drm/amd/ras/core/aca_v1_0.c            |    41 +-
 drivers/gpu/drm/amd/ras/core/aca_v5_0.c            |   448 +
 drivers/gpu/drm/amd/ras/core/aca_v5_0.h            |    62 +
 drivers/gpu/drm/amd/ras/core/cmd.c                 |   147 +-
 drivers/gpu/drm/amd/ras/core/cmd.h                 |    32 +-
 drivers/gpu/drm/amd/ras/core/core.c                |   309 +-
 drivers/gpu/drm/amd/ras/core/eeprom.c              |   504 +-
 drivers/gpu/drm/amd/ras/core/eeprom.h              |    27 +-
 drivers/gpu/drm/amd/ras/core/eeprom_fw.c           |   640 +-
 drivers/gpu/drm/amd/ras/core/eeprom_fw.h           |    67 +-
 drivers/gpu/drm/amd/ras/core/log_ring.c            |    56 +-
 drivers/gpu/drm/amd/ras/core/log_ring.h            |    46 +-
 drivers/gpu/drm/amd/ras/core/ras.h                 |   129 +-
 drivers/gpu/drm/amd/ras/core/ras_bert.c            |   546 +
 drivers/gpu/drm/amd/ras/core/ras_bert.h            |    33 +
 drivers/gpu/drm/amd/ras/core/ras_cper.c            |   844 +-
 drivers/gpu/drm/amd/ras/core/ras_cper.h            |   177 +-
 drivers/gpu/drm/amd/ras/core/ras_eeprom_mgr.c      |   418 +
 drivers/gpu/drm/amd/ras/core/ras_eeprom_mgr.h      |   124 +
 drivers/gpu/drm/amd/ras/core/ras_gfx.c             |    10 +-
 drivers/gpu/drm/amd/ras/core/ras_mce.c             |   151 +
 drivers/gpu/drm/amd/ras/core/ras_mce.h             |    51 +
 drivers/gpu/drm/amd/ras/core/ras_mp1.c             |   156 +-
 drivers/gpu/drm/amd/ras/core/ras_mp1.h             |    52 +-
 drivers/gpu/drm/amd/ras/core/ras_mp1_v13_0.c       |    12 +-
 drivers/gpu/drm/amd/ras/core/ras_mp1_v15_0.c       |   249 +
 drivers/gpu/drm/amd/ras/core/ras_mp1_v15_0.h       |    30 +
 drivers/gpu/drm/amd/ras/core/ras_nbio.c            |     9 +-
 drivers/gpu/drm/amd/ras/core/ras_process.c         |    36 +-
 drivers/gpu/drm/amd/ras/core/ras_psp.c             |   599 +-
 drivers/gpu/drm/amd/ras/core/ras_psp.h             |   111 +-
 drivers/gpu/drm/amd/ras/core/ras_psp_v13_0.c       |    76 +
 drivers/gpu/drm/amd/ras/core/ras_psp_v15_0.c       |   133 +
 drivers/gpu/drm/amd/ras/core/ras_psp_v15_0.h       |    31 +
 drivers/gpu/drm/amd/ras/core/ras_umc.c             |   635 +-
 drivers/gpu/drm/amd/ras/core/ras_umc.h             |    52 +-
 drivers/gpu/drm/amd/ras/core/ras_umc_v12_0.c       |   143 +-
 drivers/gpu/drm/amd/ras/core/ras_umc_v12_0.h       |     3 -
 drivers/gpu/drm/amd/ras/core/ras_umc_v15_0.c       |   220 +
 drivers/gpu/drm/amd/ras/core/ras_umc_v15_0.h       |    69 +
 drivers/gpu/drm/amd/ras/core/ta_if.h               |    35 +
 drivers/gpu/drm/amd/ras/ras_mgr/Makefile           |     5 +-
 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.c  |   191 +
 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.h  |    30 +
 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c   |    38 +
 .../drm/amd/ras/ras_mgr/amdgpu_ras_eeprom_i2c.c    |   141 +-
 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mce.c   |   267 +
 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mce.h   |    31 +
 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c   |   348 +-
 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.h   |     8 +-
 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1.c   |    71 +
 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1.h   |    30 +
 .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1_v13_0.c |    17 +-
 .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_process.c   |     9 +-
 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_sys.c   |   100 +-
 .../gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.c  |    42 +-
 drivers/gpu/drm/amd/ras/ras_mgr/ras_sys.h          |     2 +
 drivers/gpu/drm/drm_edid.c                         |    42 +
 drivers/gpu/drm/drm_gem.c                          |     5 +-
 include/drm/drm_connector.h                        |    47 +
 include/drm/drm_gem.h                              |    11 +
 include/drm/ttm/ttm_resource.h                     |     2 +-
 include/uapi/drm/amdgpu_drm.h                      |    41 +
 526 files changed, 113432 insertions(+), 9284 deletions(-)
 create mode 100644 Documentation/gpu/amdgpu/ualink.rst
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_internal.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_11_5.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_11_5.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/ualink_v1_0.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/ualink_v1_0.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/dcn10_clk_mgr.c
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/dcn10_clk_mgr.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn60/dcn60_smu_driver_if.h
 delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/dml21_wrapper.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_wrapper/Makefile
 rename drivers/gpu/drm/amd/display/dc/{dml2_0/dml21 => dml2_wrapper/dml21_wrapper}/dml21_translation_helper.c (96%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0/dml21 => dml2_wrapper/dml21_wrapper}/dml21_translation_helper.h (94%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0/dml21 => dml2_wrapper/dml21_wrapper}/dml21_utils.c (97%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0/dml21 => dml2_wrapper/dml21_wrapper}/dml21_utils.h (96%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0/dml21 => dml2_wrapper/dml21_wrapper}/dml21_wrapper.c (100%)
 create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_wrapper/dml21_wrapper/dml21_wrapper.h
 rename drivers/gpu/drm/amd/display/dc/{dml2_0/dml21 => dml2_wrapper/dml21_wrapper}/dml21_wrapper_fpu.c (96%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0/dml21 => dml2_wrapper/dml21_wrapper}/dml21_wrapper_fpu.h (95%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_dc_resource_mgmt.c (96%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_dc_resource_mgmt.h (100%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_dc_types.h (100%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_internal_types.h (99%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_mall_phantom.c (97%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_mall_phantom.h (100%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_policy.c (99%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_policy.h (100%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_translation_helper.c (99%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_translation_helper.h (100%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_utils.c (98%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_utils.h (100%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_wrapper.c (97%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_wrapper.h (100%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_wrapper_fpu.c (93%)
 rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_wrapper_fpu.h (100%)
 delete mode 100644 drivers/gpu/drm/amd/display/dc/sspl/spl_custom_float.c
 delete mode 100644 drivers/gpu/drm/amd/display/dc/sspl/spl_custom_float.h
 delete mode 100644 drivers/gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.c
 delete mode 100644 drivers/gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.h
 create mode 100644 drivers/gpu/drm/amd/display/dc/sspl/spl_namespace.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_5_offset.h
 create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_5_sh_mask.h
 create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/mpnht/irqsrcs_mpnht_15_0.h
 create mode 100644 drivers/gpu/drm/amd/ras/core/aca_v5_0.c
 create mode 100644 drivers/gpu/drm/amd/ras/core/aca_v5_0.h
 create mode 100644 drivers/gpu/drm/amd/ras/core/ras_bert.c
 create mode 100644 drivers/gpu/drm/amd/ras/core/ras_bert.h
 create mode 100644 drivers/gpu/drm/amd/ras/core/ras_eeprom_mgr.c
 create mode 100644 drivers/gpu/drm/amd/ras/core/ras_eeprom_mgr.h
 create mode 100644 drivers/gpu/drm/amd/ras/core/ras_mce.c
 create mode 100644 drivers/gpu/drm/amd/ras/core/ras_mce.h
 create mode 100644 drivers/gpu/drm/amd/ras/core/ras_mp1_v15_0.c
 create mode 100644 drivers/gpu/drm/amd/ras/core/ras_mp1_v15_0.h
 create mode 100644 drivers/gpu/drm/amd/ras/core/ras_psp_v15_0.c
 create mode 100644 drivers/gpu/drm/amd/ras/core/ras_psp_v15_0.h
 create mode 100644 drivers/gpu/drm/amd/ras/core/ras_umc_v15_0.c
 create mode 100644 drivers/gpu/drm/amd/ras/core/ras_umc_v15_0.h
 create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.c
 create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.h
 create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mce.c
 create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mce.h
 create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1.c
 create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1.h
$ git am -3 ../patches/0001-amdgpu-Fix-up-drm_atomic_commit-rename.patch
Applying: amdgpu: Fix up drm_atomic_commit rename
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c'
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 amdgpu: Fix up drm_atomic_commit rename
Merging drm-intel/for-linux-next (0d63d6fc993b1 drm/i915/display: Reset use_flipq when duplicating crtc state)
$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel/for-linux-next
Auto-merging drivers/gpu/drm/i915/display/intel_cdclk.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_cdclk.c
Auto-merging drivers/gpu/drm/i915/display/intel_cursor.c
Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c
Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c
Auto-merging drivers/gpu/drm/xe/Makefile
Resolved 'drivers/gpu/drm/i915/display/intel_cdclk.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 5064d3d359681] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git
$ git diff -M --stat --summary HEAD^..
 drivers/gpu/drm/i915/display/intel_atomic.c        |   1 +
 drivers/gpu/drm/i915/display/intel_audio.c         | 153 ++++++++
 drivers/gpu/drm/i915/display/intel_audio_regs.h    |  16 +-
 drivers/gpu/drm/i915/display/intel_cdclk.c         | 326 ++++++++++-------
 drivers/gpu/drm/i915/display/intel_cmtg.c          |   2 +-
 .../gpu/drm/i915/display/intel_crtc_state_dump.c   |   3 +
 drivers/gpu/drm/i915/display/intel_cursor.c        | 296 +++++++++++----
 drivers/gpu/drm/i915/display/intel_cursor_regs.h   |   8 +-
 drivers/gpu/drm/i915/display/intel_ddi.c           |  36 +-
 drivers/gpu/drm/i915/display/intel_display.c       |  76 +++-
 drivers/gpu/drm/i915/display/intel_display.h       |   3 +-
 .../drm/i915/display/intel_display_clock_gating.c  |  67 +++-
 .../drm/i915/display/intel_display_clock_gating.h  |  16 +-
 .../gpu/drm/i915/display/intel_display_debugfs.c   |  21 +-
 .../drm/i915/display/intel_display_power_well.c    |   6 +-
 drivers/gpu/drm/i915/display/intel_display_regs.h  |  18 +-
 drivers/gpu/drm/i915/display/intel_display_types.h |  19 +-
 drivers/gpu/drm/i915/display/intel_display_wa.c    |   4 +-
 drivers/gpu/drm/i915/display/intel_display_wa.h    |   9 -
 drivers/gpu/drm/i915/display/intel_dp.c            |  96 +++--
 drivers/gpu/drm/i915/display/intel_dp_mst.c        |   4 +
 drivers/gpu/drm/i915/display/intel_dpll.c          |  22 +-
 drivers/gpu/drm/i915/display/intel_dpll_mgr.c      | 221 +++++++++++-
 drivers/gpu/drm/i915/display/intel_dpll_mgr.h      |  22 ++
 drivers/gpu/drm/i915/display/intel_frontbuffer.c   |   3 +-
 drivers/gpu/drm/i915/display/intel_hdmi.c          |  53 ++-
 drivers/gpu/drm/i915/display/intel_hdmi.h          |  11 +-
 drivers/gpu/drm/i915/display/intel_hti.c           |   3 -
 .../gpu/drm/i915/display/intel_modeset_verify.c    |   1 -
 drivers/gpu/drm/i915/display/intel_parent.c        |  10 +-
 drivers/gpu/drm/i915/display/intel_parent.h        |   3 +-
 drivers/gpu/drm/i915/display/intel_psr.c           |  18 +-
 drivers/gpu/drm/i915/display/intel_snps_phy.c      |  60 +---
 drivers/gpu/drm/i915/display/intel_snps_phy.h      |   2 +
 drivers/gpu/drm/i915/display/intel_tdf.h           |  25 --
 drivers/gpu/drm/i915/display/intel_vrr.c           | 395 ++++++++++++++++-----
 drivers/gpu/drm/i915/display/intel_vrr.h           |   2 +
 drivers/gpu/drm/i915/gvt/handlers.c                |   2 +-
 drivers/gpu/drm/i915/i915_dpt.c                    |   1 -
 drivers/gpu/drm/i915/i915_reg.h                    |   2 +-
 drivers/gpu/drm/i915/intel_clock_gating.c          |  30 +-
 drivers/gpu/drm/i915/intel_gvt_mmio_table.c        |   2 +-
 drivers/gpu/drm/i915/intel_pcode.c                 |  14 +-
 drivers/gpu/drm/i915/intel_pcode.h                 |   2 +-
 drivers/gpu/drm/xe/Makefile                        |   3 +-
 drivers/gpu/drm/xe/display/xe_display.c            |  22 +-
 drivers/gpu/drm/xe/display/xe_display_rpm.c        |   2 -
 drivers/gpu/drm/xe/display/xe_display_wa.c         |  13 +-
 drivers/gpu/drm/xe/display/xe_display_wa.h         |   9 +
 drivers/gpu/drm/xe/display/xe_tdf.c                |  15 -
 include/drm/intel/display_parent_interface.h       |  15 +-
 51 files changed, 1544 insertions(+), 619 deletions(-)
 delete mode 100644 drivers/gpu/drm/i915/display/intel_tdf.h
 create mode 100644 drivers/gpu/drm/xe/display/xe_display_wa.h
 delete mode 100644 drivers/gpu/drm/xe/display/xe_tdf.c
Merging drm-msm/msm-next (140b134753026 drm/msm: detach the ARM DMA mapping before attaching our own domain)
$ 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 (140b134753026 drm/msm: detach the ARM DMA mapping before attaching our own domain)
$ 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 drm-xe/drm-xe-next (6ef3eb10aea42 drm/xe: Add fault-inject based VRAM page offline injection)
$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe/drm-xe-next
Auto-merging MAINTAINERS
Auto-merging drivers/gpu/drm/xe/Makefile
Auto-merging drivers/gpu/drm/xe/xe_oa.c
Auto-merging drivers/gpu/drm/xe/xe_vm.c
Auto-merging drivers/gpu/drm/xe/xe_vram.c
Merge made by the 'ort' strategy.
 Documentation/gpu/drm-ras.rst                 |  39 ++
 Documentation/gpu/drm-uapi.rst                |  93 +++-
 Documentation/gpu/xe/index.rst                |   1 +
 Documentation/gpu/xe/xe_sigid.rst             |  14 +
 Documentation/netlink/specs/drm_ras.yaml      |  80 +++
 MAINTAINERS                                   |  13 +
 drivers/gpu/drm/drm_drv.c                     |   2 +
 drivers/gpu/drm/drm_ras.c                     | 278 +++++++++-
 drivers/gpu/drm/drm_ras_nl.c                  |  33 ++
 drivers/gpu/drm/drm_ras_nl.h                  |   8 +
 drivers/gpu/drm/xe/Makefile                   |   1 +
 drivers/gpu/drm/xe/abi/guc_actions_slpc_abi.h |   1 +
 drivers/gpu/drm/xe/abi/xe_log_abi.h           | 199 +++++++
 drivers/gpu/drm/xe/abi/xe_sigid_abi.h         | 172 ++++++
 drivers/gpu/drm/xe/display/xe_display_pcode.c |   4 +-
 drivers/gpu/drm/xe/display/xe_dsb_buffer.c    |   2 +-
 drivers/gpu/drm/xe/display/xe_fb_pin.c        |   2 +-
 drivers/gpu/drm/xe/display/xe_panic.c         |   3 +-
 drivers/gpu/drm/xe/regs/xe_gt_regs.h          |   6 +
 drivers/gpu/drm/xe/regs/xe_lrc_layout.h       |   2 +
 drivers/gpu/drm/xe/tests/Makefile             |   1 +
 drivers/gpu/drm/xe/tests/xe_any_kunit.c       | 213 ++++++++
 drivers/gpu/drm/xe/tests/xe_kunit_helpers.c   |   4 +
 drivers/gpu/drm/xe/tests/xe_log_kunit.c       | 553 +++++++++++++++++++
 drivers/gpu/drm/xe/xe_any.h                   | 137 +++++
 drivers/gpu/drm/xe/xe_bo.c                    |  25 +-
 drivers/gpu/drm/xe/xe_bo.h                    |   2 +
 drivers/gpu/drm/xe/xe_bo_types.h              |   8 +
 drivers/gpu/drm/xe/xe_configfs.c              |  72 ++-
 drivers/gpu/drm/xe/xe_configfs.h              |   2 +
 drivers/gpu/drm/xe/xe_debugfs.c               |  66 +++
 drivers/gpu/drm/xe/xe_debugfs.h               |   4 +
 drivers/gpu/drm/xe/xe_defaults.h              |   1 +
 drivers/gpu/drm/xe/xe_device.c                |  44 +-
 drivers/gpu/drm/xe/xe_device.h                |   2 +-
 drivers/gpu/drm/xe/xe_device_types.h          |  23 +-
 drivers/gpu/drm/xe/xe_dma_buf.c               |   3 +
 drivers/gpu/drm/xe/xe_drm_ras.c               |  65 +++
 drivers/gpu/drm/xe/xe_drm_ras.h               |   3 +
 drivers/gpu/drm/xe/xe_drm_ras_types.h         |   3 +
 drivers/gpu/drm/xe/xe_exec_queue.c            |  78 ++-
 drivers/gpu/drm/xe/xe_exec_queue_types.h      |  28 +-
 drivers/gpu/drm/xe/xe_execlist.c              |   4 +-
 drivers/gpu/drm/xe/xe_ggtt.c                  |  74 ++-
 drivers/gpu/drm/xe/xe_gsc.c                   |   3 +-
 drivers/gpu/drm/xe/xe_gt.c                    |  13 +-
 drivers/gpu/drm/xe/xe_gt.h                    |  13 +
 drivers/gpu/drm/xe/xe_gt_debugfs.c            | 146 ++++++
 drivers/gpu/drm/xe/xe_gt_idle.c               |  45 +-
 drivers/gpu/drm/xe/xe_gt_printk.h             |   3 +
 drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c    | 191 ++++---
 drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h    |   6 +
 drivers/gpu/drm/xe/xe_gt_sriov_printk.h       |   3 +
 drivers/gpu/drm/xe/xe_gt_stats.c              |   7 +
 drivers/gpu/drm/xe/xe_gt_stats_types.h        |  22 +
 drivers/gpu/drm/xe/xe_gt_types.h              |  29 +
 drivers/gpu/drm/xe/xe_guc.c                   |  18 +-
 drivers/gpu/drm/xe/xe_guc_ct.c                |  95 +++-
 drivers/gpu/drm/xe/xe_guc_ct.h                |  38 +-
 drivers/gpu/drm/xe/xe_guc_exec_queue_types.h  |  32 +-
 drivers/gpu/drm/xe/xe_guc_pagefault.c         |  47 +-
 drivers/gpu/drm/xe/xe_guc_pc.c                |  15 +-
 drivers/gpu/drm/xe/xe_guc_submit.c            | 303 ++++++++---
 drivers/gpu/drm/xe/xe_guc_tlb_inval.c         |  29 +
 drivers/gpu/drm/xe/xe_guc_types.h             |   6 +
 drivers/gpu/drm/xe/xe_hwmon.c                 |  88 ++--
 drivers/gpu/drm/xe/xe_i2c.c                   |  22 +-
 drivers/gpu/drm/xe/xe_i2c.h                   |   1 +
 drivers/gpu/drm/xe/xe_log.c                   | 235 +++++++++
 drivers/gpu/drm/xe/xe_log.h                   | 194 +++++++
 drivers/gpu/drm/xe/xe_lrc.c                   |  33 ++
 drivers/gpu/drm/xe/xe_mert.c                  |   2 +-
 drivers/gpu/drm/xe/xe_migrate.c               | 123 ++++-
 drivers/gpu/drm/xe/xe_migrate.h               |   6 +
 drivers/gpu/drm/xe/xe_module.c                |   4 +
 drivers/gpu/drm/xe/xe_module.h                |   1 +
 drivers/gpu/drm/xe/xe_oa.c                    |   7 +-
 drivers/gpu/drm/xe/xe_pagefault.c             | 730 +++++++++++++++++++++-----
 drivers/gpu/drm/xe/xe_pagefault.h             |  74 +++
 drivers/gpu/drm/xe/xe_pagefault_types.h       | 119 ++++-
 drivers/gpu/drm/xe/xe_pci.c                   |  32 +-
 drivers/gpu/drm/xe/xe_pci_error.c             |  13 +-
 drivers/gpu/drm/xe/xe_pcode.c                 |  27 +-
 drivers/gpu/drm/xe/xe_pcode.h                 |   2 +-
 drivers/gpu/drm/xe/xe_pm.c                    |   5 +
 drivers/gpu/drm/xe/xe_printk.h                |   3 +
 drivers/gpu/drm/xe/xe_pt.c                    |   6 +
 drivers/gpu/drm/xe/xe_pxp_submit.c            |   5 +-
 drivers/gpu/drm/xe/xe_ras.c                   | 245 ++++++++-
 drivers/gpu/drm/xe/xe_ras.h                   |   2 +
 drivers/gpu/drm/xe/xe_ras_types.h             |  50 ++
 drivers/gpu/drm/xe/xe_sriov_printk.h          |   3 +
 drivers/gpu/drm/xe/xe_sriov_vf_ccs.c          |   1 -
 drivers/gpu/drm/xe/xe_survivability_mode.c    |  85 +--
 drivers/gpu/drm/xe/xe_svm.c                   | 146 ++++--
 drivers/gpu/drm/xe/xe_svm.h                   |  59 ++-
 drivers/gpu/drm/xe/xe_sysctrl_event.c         |  28 +-
 drivers/gpu/drm/xe/xe_sysctrl_mailbox_types.h |   4 +
 drivers/gpu/drm/xe/xe_tile_printk.h           |   3 +
 drivers/gpu/drm/xe/xe_tile_sriov_printk.h     |   3 +
 drivers/gpu/drm/xe/xe_tile_types.h            |   4 +
 drivers/gpu/drm/xe/xe_tlb_inval.c             |  42 +-
 drivers/gpu/drm/xe/xe_tlb_inval.h             |   1 +
 drivers/gpu/drm/xe/xe_tlb_inval_types.h       |  10 +
 drivers/gpu/drm/xe/xe_ttm_vram_mgr.c          | 600 ++++++++++++++++++++-
 drivers/gpu/drm/xe/xe_ttm_vram_mgr.h          |   3 +
 drivers/gpu/drm/xe/xe_ttm_vram_mgr_types.h    |  40 ++
 drivers/gpu/drm/xe/xe_userptr.c               |  19 +-
 drivers/gpu/drm/xe/xe_vm.c                    | 309 ++++++++---
 drivers/gpu/drm/xe/xe_vm_types.h              |  44 +-
 drivers/gpu/drm/xe/xe_vram.c                  | 255 ++++++++-
 drivers/gpu/drm/xe/xe_vram.h                  |  10 +
 drivers/gpu/drm/xe/xe_wa.c                    |   4 +-
 include/drm/drm_device.h                      |   1 +
 include/drm/drm_ras.h                         |  34 ++
 include/uapi/drm/drm_ras.h                    |  18 +
 include/uapi/drm/xe_drm.h                     |  22 +-
 117 files changed, 6454 insertions(+), 755 deletions(-)
 create mode 100644 Documentation/gpu/xe/xe_sigid.rst
 create mode 100644 drivers/gpu/drm/xe/abi/xe_log_abi.h
 create mode 100644 drivers/gpu/drm/xe/abi/xe_sigid_abi.h
 create mode 100644 drivers/gpu/drm/xe/tests/xe_any_kunit.c
 create mode 100644 drivers/gpu/drm/xe/tests/xe_log_kunit.c
 create mode 100644 drivers/gpu/drm/xe/xe_any.h
 create mode 100644 drivers/gpu/drm/xe/xe_log.c
 create mode 100644 drivers/gpu/drm/xe/xe_log.h
$ git am -3 ../patches/0001-drm-xe-Fix-up-merge-issue.patch
Applying: drm: xe: Fix up merge issue
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
No changes -- Patch already applied.
Merging drm-rust/for-linux-next (e6a2c988ed96a gpu: nova-core: mm: Add PRAMIN aperture self-tests)
$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/for-linux-next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 Documentation/gpu/nova/core/pramin.rst             | 128 ++++
 Documentation/gpu/nova/index.rst                   |   1 +
 MAINTAINERS                                        |   1 +
 drivers/gpu/drm/tyr/driver.rs                      |   1 +
 drivers/gpu/drm/tyr/fw.rs                          |   5 +-
 drivers/gpu/drm/tyr/regs.rs                        |  45 +-
 drivers/gpu/nova-core/Kconfig                      |   9 +
 drivers/gpu/nova-core/driver.rs                    |   4 +
 drivers/gpu/nova-core/falcon.rs                    | 162 ++---
 drivers/gpu/nova-core/falcon/fsp.rs                |  63 +-
 drivers/gpu/nova-core/falcon/gsp.rs                |  51 +-
 drivers/gpu/nova-core/falcon/hal/ga102.rs          |  59 +-
 drivers/gpu/nova-core/falcon/hal/tu102.rs          |   9 +-
 drivers/gpu/nova-core/falcon/sec2.rs               |  37 +-
 drivers/gpu/nova-core/fb/hal/gb100.rs              |  59 +-
 drivers/gpu/nova-core/fb/regs.rs                   |  34 +-
 drivers/gpu/nova-core/firmware.rs                  |   2 +-
 drivers/gpu/nova-core/firmware/fwsec/bootloader.rs |  18 +-
 .../gpu/nova-core/firmware/{fsp.rs => gsp_fmc.rs}  |  55 +-
 drivers/gpu/nova-core/fsp.rs                       |  29 +-
 drivers/gpu/nova-core/gpu.rs                       |  37 +-
 drivers/gpu/nova-core/gpu/regs.rs                  |  86 +++
 drivers/gpu/nova-core/gsp/boot.rs                  |  10 +-
 drivers/gpu/nova-core/gsp/cmdq.rs                  |  43 +-
 drivers/gpu/nova-core/gsp/commands.rs              |   4 +
 drivers/gpu/nova-core/gsp/fw/commands.rs           |   5 +
 drivers/gpu/nova-core/gsp/hal/tu102.rs             |   7 +-
 drivers/gpu/nova-core/gsp/regs.rs                  |   9 +-
 drivers/gpu/nova-core/mm.rs                        | 163 +++++
 drivers/gpu/nova-core/mm/hal.rs                    |  56 ++
 drivers/gpu/nova-core/mm/hal/gb100.rs              |  35 +
 drivers/gpu/nova-core/mm/hal/gh100.rs              |  35 +
 drivers/gpu/nova-core/mm/hal/tu102.rs              |  37 +
 drivers/gpu/nova-core/mm/pramin.rs                 | 312 ++++++++
 drivers/gpu/nova-core/mm/regs.rs                   |  70 ++
 drivers/gpu/nova-core/nova_core.rs                 |   3 +
 drivers/gpu/nova-core/regs.rs                      | 189 ++---
 drivers/gpu/nova-core/selftest.rs                  |  64 ++
 drivers/gpu/nova-core/vbios.rs                     |  11 +-
 rust/kernel/bitfield.rs                            |   9 +
 rust/kernel/device_id.rs                           |   3 +-
 rust/kernel/io.rs                                  | 220 ++++--
 rust/kernel/io/register.rs                         | 803 +++++----------------
 rust/kernel/lib.rs                                 |   1 +
 rust/kernel/mem.rs                                 | 234 ++++++
 rust/kernel/sync/atomic.rs                         |   4 +-
 rust/macros/io/mod.rs                              |   3 +
 rust/macros/io/register.rs                         | 296 ++++++++
 rust/macros/lib.rs                                 |   9 +
 samples/rust/rust_driver_pci.rs                    |   4 +
 50 files changed, 2420 insertions(+), 1114 deletions(-)
 create mode 100644 Documentation/gpu/nova/core/pramin.rst
 rename drivers/gpu/nova-core/firmware/{fsp.rs => gsp_fmc.rs} (71%)
 create mode 100644 drivers/gpu/nova-core/gpu/regs.rs
 create mode 100644 drivers/gpu/nova-core/mm.rs
 create mode 100644 drivers/gpu/nova-core/mm/hal.rs
 create mode 100644 drivers/gpu/nova-core/mm/hal/gb100.rs
 create mode 100644 drivers/gpu/nova-core/mm/hal/gh100.rs
 create mode 100644 drivers/gpu/nova-core/mm/hal/tu102.rs
 create mode 100644 drivers/gpu/nova-core/mm/pramin.rs
 create mode 100644 drivers/gpu/nova-core/mm/regs.rs
 create mode 100644 drivers/gpu/nova-core/selftest.rs
 create mode 100644 rust/kernel/mem.rs
 create mode 100644 rust/macros/io/mod.rs
 create mode 100644 rust/macros/io/register.rs
Merging drm-nova/nova-next (93296e9d9528f gpu: nova-core: vbios: store reference to Device where relevant)
$ git merge -m Merge branch 'nova-next' of https://gitlab.freedesktop.org/drm/nova.git drm-nova/nova-next
Already up to date.
Merging etnaviv/etnaviv/next (6bde14ba5f7ef drm/etnaviv: add optional reset support)
$ 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 (94e6a058b1682 fbcon: Fix KASAN slab-out-of-bounds Read in fbcon_prepare_logo)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next
Merge made by the 'ort' strategy.
 drivers/tty/vt/vt.c                                              | 9 +++++----
 drivers/video/fbdev/core/fbcon.c                                 | 7 +++++++
 drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c | 5 +++--
 3 files changed, 15 insertions(+), 6 deletions(-)
$ git am -3 ../patches/0001-fix-up-for-drm-hyperv-Remove-reference-to-hyperv_fb-.patch
Applying: fix up for "drm/hyperv: Remove reference to hyperv_fb driver"
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/gpu/drm/hyperv/Kconfig
$ git add -A .
$ git commit -v -a --amend
warning: notes ref refs/notes/commits is invalid
[master d0e37de6e6492] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git
 Date: Mon Sep 7 14:27:07 2026 +0100
Merging regmap/for-next (070a698c9b230 Merge remote-tracking branch 'regmap/for-7.4' into regmap-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next
Merge made by the 'ort' strategy.
 drivers/base/regmap/internal.h       |  1 +
 drivers/base/regmap/regmap-kunit.c   | 98 ++++++++++++++++++++++++++++++++++--
 drivers/base/regmap/regmap-ram.c     | 26 +++++++---
 drivers/base/regmap/regmap-raw-ram.c | 21 +++++---
 drivers/base/regmap/regmap.c         |  2 +-
 5 files changed, 130 insertions(+), 18 deletions(-)
Merging sound/for-next (4c4e4be4edd5d ALSA: rawmidi: Add a proper disconnect handling)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next
Auto-merging sound/core/rawmidi.c
Auto-merging sound/usb/quirks.c
Merge made by the 'ort' strategy.
 include/sound/rawmidi.h  |   1 +
 sound/core/rawmidi.c     |  18 +++--
 sound/usb/quirks-table.h | 206 +++++++++++++++++++++++++++++++++++++++++++++--
 sound/usb/quirks.c       |  74 +++++++++++++++++
 4 files changed, 286 insertions(+), 13 deletions(-)
Merging ieee1394/for-next (68097f9cdd526 tools/firewire: nosy-dump: fix input file handle leak)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next
Merge made by the 'ort' strategy.
 drivers/firewire/.kunitconfig                |   1 +
 drivers/firewire/Kconfig                     |  16 ++
 drivers/firewire/config-rom-generator-test.c | 407 +++++++++++++++++++++++++++
 drivers/firewire/config-rom-parser-test.c    | 355 +++++++++++++++++++++++
 drivers/firewire/core-card.c                 |   4 +
 drivers/firewire/core-device.c               |   4 +
 drivers/firewire/core-transaction.c          |   4 +
 drivers/firewire/ohci.c                      |   8 +-
 include/linux/firewire.h                     |   4 +-
 tools/firewire/nosy-dump.c                   |  10 +-
 10 files changed, 805 insertions(+), 8 deletions(-)
 create mode 100644 drivers/firewire/config-rom-generator-test.c
 create mode 100644 drivers/firewire/config-rom-parser-test.c
Merging sound-asoc/for-next (ab2ee08852b77 Merge remote-tracking branch 'asoc/for-7.4' into asoc-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 .../bindings/sound/davinci-evm-audio.txt           |   49 -
 .../bindings/sound/foursemi,fs2105s.yaml           |    2 +-
 .../devicetree/bindings/sound/imx-audmux.yaml      |    8 +-
 .../devicetree/bindings/sound/nuvoton,nau8360.yaml |  115 +
 .../bindings/sound/ti,da830-evm-audio.yaml         |   83 +
 MAINTAINERS                                        |    3 +
 include/sound/soc_sdw_utils.h                      |   20 +
 include/sound/tas2781-dsp.h                        |    4 +
 sound/soc/codecs/Kconfig                           |   24 +
 sound/soc/codecs/Makefile                          |    4 +
 sound/soc/codecs/ak4642.c                          |    5 +-
 sound/soc/codecs/lpass-rx-macro.c                  |    2 +-
 sound/soc/codecs/lpass-tx-macro.c                  |    2 +-
 sound/soc/codecs/lpass-va-macro.c                  |    2 +-
 sound/soc/codecs/lpass-wsa-macro.c                 |    2 +-
 sound/soc/codecs/nau8360-dsp.c                     |  634 ++++++
 sound/soc/codecs/nau8360-dsp.h                     |  122 ++
 sound/soc/codecs/nau8360.c                         | 2302 ++++++++++++++++++++
 sound/soc/codecs/nau8360.h                         |  911 ++++++++
 sound/soc/codecs/sn624x-sdca-sdw.c                 | 1888 ++++++++++++++++
 sound/soc/codecs/sn624x-sdca.h                     |  152 ++
 sound/soc/codecs/sta32x.c                          |    6 +-
 sound/soc/codecs/sta350.c                          |    6 +-
 sound/soc/codecs/tas2764.c                         |    2 +-
 sound/soc/codecs/tas2770.c                         |    2 +-
 sound/soc/codecs/tas2781-comlib-i2c.c              |    7 +-
 sound/soc/codecs/tas2781-comlib.c                  |   22 +-
 sound/soc/codecs/tas2781-fmwlib.c                  |    4 +-
 sound/soc/codecs/tlv320aic32x4-clk.c               |    2 +-
 sound/soc/codecs/twl4030.c                         |    5 +-
 sound/soc/codecs/wcd-mbhc-v2.c                     |    8 +-
 sound/soc/codecs/wcd934x.c                         |    2 +-
 sound/soc/fsl/fsl_mqs.c                            |   14 +
 sound/soc/intel/boards/Kconfig                     |    1 +
 sound/soc/intel/common/soc-acpi-intel-arl-match.c  |   71 +
 sound/soc/intel/common/soc-acpi-intel-lnl-match.c  |   71 +
 sound/soc/intel/common/soc-acpi-intel-mtl-match.c  |   71 +
 sound/soc/intel/common/soc-acpi-intel-ptl-match.c  |   82 +
 sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c  |   61 +-
 sound/soc/mediatek/mt2701/mt2701-afe-pcm.c         |    4 +-
 sound/soc/mediatek/mt2701/mt2701-cs42448.c         |    4 +-
 sound/soc/mediatek/mt2701/mt2701-wm8960.c          |    4 +-
 sound/soc/mediatek/mt7986/mt7986-afe-pcm.c         |    8 +-
 sound/soc/mediatek/mt7986/mt7986-dai-etdm.c        |    2 +-
 sound/soc/mediatek/mt7986/mt7986-wm8960.c          |    4 +-
 sound/soc/mediatek/mt8173/mt8173-afe-pcm.c         |   24 +-
 sound/soc/samsung/aries_wm8994.c                   |   14 +-
 sound/soc/samsung/pcm.c                            |   19 +-
 sound/soc/samsung/spdif.c                          |    8 +-
 sound/soc/samsung/tm2_wm5110.c                     |   12 +-
 sound/soc/sdw_utils/Makefile                       |    4 +-
 sound/soc/sdw_utils/soc_sdw_senary_amp.c           |   80 +
 sound/soc/sdw_utils/soc_sdw_senary_dmic.c          |   49 +
 sound/soc/sdw_utils/soc_sdw_senary_sdca.c          |   63 +
 .../sdw_utils/soc_sdw_senary_sdca_jack_common.c    |  197 ++
 sound/soc/sdw_utils/soc_sdw_utils.c                |  166 ++
 sound/soc/soc-component.c                          |    8 +-
 sound/soc/soc-core.c                               |    2 +-
 sound/soc/soc-ops.c                                |    4 +-
 sound/soc/sof/imx/imx8.c                           |    1 -
 sound/soc/tegra/tegra210_adx.c                     |   12 +-
 sound/soc/tegra/tegra210_adx.h                     |    2 +-
 sound/soc/uniphier/aio-dma.c                       |    5 +-
 63 files changed, 7257 insertions(+), 210 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
 create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8360.yaml
 create mode 100644 Documentation/devicetree/bindings/sound/ti,da830-evm-audio.yaml
 create mode 100644 sound/soc/codecs/nau8360-dsp.c
 create mode 100644 sound/soc/codecs/nau8360-dsp.h
 create mode 100644 sound/soc/codecs/nau8360.c
 create mode 100644 sound/soc/codecs/nau8360.h
 create mode 100644 sound/soc/codecs/sn624x-sdca-sdw.c
 create mode 100644 sound/soc/codecs/sn624x-sdca.h
 create mode 100644 sound/soc/sdw_utils/soc_sdw_senary_amp.c
 create mode 100644 sound/soc/sdw_utils/soc_sdw_senary_dmic.c
 create mode 100644 sound/soc/sdw_utils/soc_sdw_senary_sdca.c
 create mode 100644 sound/soc/sdw_utils/soc_sdw_senary_sdca_jack_common.c
Merging modules/modules-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'modules-next' of https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next
Already up to date.
Merging input/next (fcc1d6eab4ce4 Input: st-keyscan - improve probe error handling)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
Merge made by the 'ort' strategy.
 drivers/input/keyboard/snvs_pwrkey.c |  9 ++++-----
 drivers/input/keyboard/st-keyscan.c  | 13 +++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)
Merging block/for-next (ba285edf3fd1a Merge branch 'block-7.3' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git block/for-next
Merge made by the 'ort' strategy.
$ git am -3 ../patches/0001-Revert-block-remove-bio_last_bvec_all.patch
Applying: Revert "block: remove bio_last_bvec_all"
$ git reset HEAD^
Unstaged changes after reset:
M	Documentation/block/biovecs.rst
M	include/linux/bio.h
$ git add -A .
$ git commit -v -a --amend
warning: notes ref refs/notes/commits is invalid
[master 2d7b4b35e4fc3] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git
 Date: Mon Sep 7 14:27:19 2026 +0100
Merging device-mapper/for-next (39c5aa3bd8ec3 dm-era: fix shadowed superblock leak on take-snap failure)
$ git merge -m Merge branch 'for-next' of https://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 (bd46a0b22933f ata: pata_parport: Fix use-after-free in new_device_store)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next
Auto-merging drivers/ata/ahci.c
Merge made by the 'ort' strategy.
 drivers/ata/Kconfig                     |  10 ++
 drivers/ata/Makefile                    |   1 +
 drivers/ata/ahci.c                      |   1 +
 drivers/ata/ahci_brcm.c                 |   1 +
 drivers/ata/ahci_ceva.c                 |   1 +
 drivers/ata/ahci_qoriq.c                |   1 +
 drivers/ata/ata_generic.c               |  16 +++
 drivers/ata/libahci.c                   |   1 +
 drivers/ata/pata_cswarp.c               | 183 ++++++++++++++++++++++++++++++++
 drivers/ata/pata_parport/pata_parport.c |   7 +-
 10 files changed, 219 insertions(+), 3 deletions(-)
 create mode 100644 drivers/ata/pata_cswarp.c
Merging pcmcia/pcmcia-next (b3c26ea81ccc5 pcmcia: remove obsolete host controller drivers)
$ git merge -m Merge branch 'pcmcia-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next
Already up to date.
Merging mmc/next (534e7ff869b7b mmc: Merge branch fixes into next)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next
Merge made by the 'ort' strategy.
 .../devicetree/bindings/mmc/mmc-controller-common.yaml         | 10 ++++++++++
 drivers/mmc/core/core.c                                        |  2 +-
 drivers/mmc/core/core.h                                        |  8 ++++++++
 drivers/mmc/core/host.c                                        |  4 ++++
 drivers/mmc/core/sdio_cis.c                                    |  5 ++---
 include/linux/mmc/host.h                                       |  1 +
 6 files changed, 26 insertions(+), 4 deletions(-)
Merging mfd/for-mfd-next (b07adc1a304c7 mfd: Fix MAX77705 dependency on regmap)
$ git merge -m Merge branch 'for-mfd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next
Merge made by the 'ort' strategy.
 drivers/mfd/Kconfig       |  2 ++
 drivers/mfd/da903x.c      | 34 +++++++++++++++++++++++++---------
 drivers/mfd/da9062-core.c | 24 ++++++++++++------------
 3 files changed, 39 insertions(+), 21 deletions(-)
Merging backlight/for-backlight-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-backlight-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next
Already up to date.
Merging battery/for-next (2da28b059e0dd power: supply: bq27xxx: bq27z561: fix invalid AverageEnergy address)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next
Already up to date.
Merging regulator/for-next (f656e44fc0c84 Merge remote-tracking branch 'regulator/for-7.4' into regulator-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next
Merge made by the 'ort' strategy.
 .../devicetree/bindings/regulator/ti,tps65023.yaml | 90 ++++++++++++++++++++++
 .../devicetree/bindings/regulator/tps65023.txt     | 60 ---------------
 drivers/regulator/fixed.c                          |  4 +
 drivers/regulator/pca9450-regulator.c              | 81 ++++++++++++++++---
 include/linux/regulator/pca9450.h                  |  4 +-
 5 files changed, 167 insertions(+), 72 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps65023.yaml
 delete mode 100644 Documentation/devicetree/bindings/regulator/tps65023.txt
Merging security/next (3a84fc1a21577 lsm: don't call security_backing_file_free() multiple times)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next
Auto-merging fs/namespace.c
Auto-merging include/linux/ns/ns_common_types.h
CONFLICT (content): Merge conflict in include/linux/ns/ns_common_types.h
Auto-merging include/linux/sched.h
Resolved 'include/linux/ns/ns_common_types.h' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 43208f9c83d6a] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
$ git diff -M --stat --summary HEAD^..
 fs/namespace.c                     |  3 +-
 include/linux/cred.h               | 17 ++++++---
 include/linux/lsm_audit.h          |  5 +++
 include/linux/lsm_hook_defs.h      |  3 ++
 include/linux/lsm_hooks.h          |  1 +
 include/linux/ns/ns_common_types.h |  3 ++
 include/linux/sched.h              |  8 +++-
 include/linux/security.h           | 20 ++++++++++
 include/uapi/linux/nsfs.h          |  1 +
 init/init_task.c                   |  2 +-
 kernel/auditsc.c                   |  5 ++-
 kernel/cred.c                      |  2 +-
 kernel/nscommon.c                  | 17 ++++++++-
 kernel/nsproxy.c                   |  6 +++
 security/lsm_audit.c               |  6 ++-
 security/lsm_init.c                |  6 +--
 security/security.c                | 75 +++++++++++++++++++++++++++++++++++++-
 17 files changed, 159 insertions(+), 21 deletions(-)
Merging apparmor/apparmor-next (3daad923a8685 apparmor: policy_int make sure list heads are initialized before fail path)
$ git merge -m Merge branch 'apparmor-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next
Already up to date.
Merging integrity/next-integrity (6903878d4654b ima: allow users to specify the pcr index with IMA_MEASURE_PCR_IDX)
$ git merge -m Merge branch 'next-integrity' of https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity
Already up to date.
Merging selinux/next (d404805dc9898 Automated merge of 'dev' into 'next')
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next
Merge made by the 'ort' strategy.
 security/selinux/selinuxfs.c    | 34 ++++++++++++++++------------------
 security/selinux/ss/mls.c       | 38 --------------------------------------
 security/selinux/ss/mls.h       |  3 ---
 security/selinux/ss/mls_types.h |  3 ---
 security/selinux/ss/policydb.c  | 11 ++++-------
 5 files changed, 20 insertions(+), 69 deletions(-)
Merging smack/next (fedc88e38ce97 smack: fix cred UAF in smack_file_send_sigiotask())
$ git merge -m Merge branch 'next' of https://github.com/cschaufler/smack-next smack/next
Already up to date.
Merging tomoyo/master (1fc5a74b108fc Merge tag 'kmalloc_obj-v7.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master
Already up to date.
Merging tpmdd-tpm/for-next-tpm (22a50c3745c5c tpm: Call cmd_ready/go_idle for each command transmission)
$ git merge -m Merge branch 'for-next-tpm' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd-tpm/for-next-tpm
Merge made by the 'ort' strategy.
 drivers/char/tpm/tpm-chip.c          | 24 ------------------------
 drivers/char/tpm/tpm-interface.c     | 23 ++++++++++++++++++++++-
 include/keys/request_key_auth-type.h |  2 +-
 security/keys/gc.c                   |  4 +---
 security/keys/request_key_auth.c     | 12 +++++++++---
 5 files changed, 33 insertions(+), 32 deletions(-)
Merging tpmdd-keys/for-next-keys (bf0d7882cd43d keys: translate request_key_auth pid for the reading procfs instance)
$ git merge -m Merge branch 'for-next-keys' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd-keys/for-next-keys
Already up to date.
Merging watchdog/watchdog-next (b85ed7f7259b4 watchdog: Differentiate scenarios when watchdog is closed)
$ git merge -m Merge branch 'watchdog-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog/watchdog-next
Merge made by the 'ort' strategy.
 .../bindings/watchdog/renesas,r9a09g057-wdt.yaml   | 29 +++++++++-
 .../devicetree/bindings/watchdog/samsung-wdt.yaml  | 23 +++++++-
 Documentation/watchdog/watchdog-parameters.rst     |  2 +
 drivers/watchdog/mtk_wdt.c                         | 62 +++++++++++++++++++---
 drivers/watchdog/s3c2410_wdt.c                     | 16 ++++++
 drivers/watchdog/sbsa_gwdt.c                       | 19 ++++++-
 drivers/watchdog/sp5100_tco.c                      | 61 +++++++++++++++++++--
 drivers/watchdog/watchdog_dev.c                    |  4 ++
 8 files changed, 200 insertions(+), 16 deletions(-)
Merging iommu/next (3c6a2bac15247 Merge branches 'arm/smmu/updates', 'arm/smmu/bindings', 'mediatek', 'qualcomm/msm', 'rockchip', 'ti/omap', 'riscv', 'intel/vt-d', 'amd/amd-vi', 'core' and 'typos' into next)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next
Already up to date.
Merging audit/next (ca12826b4aac8 audit: Fix filter rule accounting after automatic removal)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next
Auto-merging kernel/auditsc.c
Merge made by the 'ort' strategy.
 include/linux/audit.h |  6 ++--
 kernel/audit.c        |  2 +-
 kernel/audit.h        |  5 +++
 kernel/audit_tree.c   |  1 +
 kernel/audit_watch.c  |  2 ++
 kernel/auditfilter.c  | 86 +++++++++++++++++++++++++--------------------------
 kernel/auditsc.c      |  2 ++
 7 files changed, 56 insertions(+), 48 deletions(-)
Merging devicetree/for-next (8273a4059c417 dt-bindings: arm: mediatek: mediatek,g3dsys: Convert to DT schema)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next
Auto-merging Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml
Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 .../devicetree/bindings/arm/arm,coresight-cti.yaml |   2 +-
 .../bindings/arm/mediatek/mediatek,g3dsys.txt      |  30 -
 Documentation/devicetree/bindings/arm/omap/mpu.txt |  54 --
 .../devicetree/bindings/arm/ti/ti,omap-mpu.yaml    |  58 ++
 .../devicetree/bindings/bus/omap-ocp2scp.txt       |  29 -
 .../devicetree/bindings/bus/ti,omap-ocp2scp.yaml   |  74 ++
 .../bindings/display/bridge/sil,sii9022.yaml       |   2 +-
 .../devicetree/bindings/gpio/delta,tn48m-gpio.yaml |   2 +-
 .../devicetree/bindings/hwmon/adi,ltc2991.yaml     |   2 +-
 .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml          |   4 +-
 .../bindings/iio/light/upisemi,us5182.yaml         |   2 +-
 .../devicetree/bindings/input/matrix-keymap.yaml   |   3 +-
 .../devicetree/bindings/input/ti,tca8418.yaml      |  21 +-
 .../bindings/interrupt-controller/qcom,pdc.yaml    |   1 +
 .../devicetree/bindings/media/nxp,imx8-jpeg.yaml   |   4 +-
 .../devicetree/bindings/mfd/ti,tps65910.yaml       |   2 +-
 .../bindings/nvmem/zii,rave-sp-eeprom.yaml         |   2 +-
 .../bindings/pci/hisilicon,kirin-pcie.yaml         |   4 +-
 .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml   |   2 +-
 .../soc/mediatek/mediatek,mt2701-g3dsys.yaml       |  58 ++
 .../bindings/spi/aspeed,ast2600-fmc.yaml           |   6 +-
 .../devicetree/bindings/thermal/thermal-idle.yaml  |   2 +-
 .../devicetree/bindings/trivial-devices.yaml       |   4 +-
 MAINTAINERS                                        |   2 +
 drivers/of/property.c                              |   6 +-
 include/dt-bindings/clock/agilex-clock.h           |   1 +
 scripts/dtc/dt-check-style                         | 854 ++++++++++++---------
 .../bad/dts-child-name-order.dtso                  |  33 +
 .../dtc/dt-style-selftest/bad/dts-cont-align.dts   |  26 +
 .../dt-style-selftest/bad/dts-digit-node-order.dts |  40 +
 .../bad/dts-digit-node-order.dtso                  |  41 +
 .../bad/dts-extend-node-child-name-order.dtso      |  26 +
 .../bad/dts-extend-node-digit-node-order.dtso      |  34 +
 .../dtc/dt-style-selftest/bad/dts-line-length.dts  |  21 +
 .../dtc/dt-style-selftest/bad/dts-node-name.dts    |  60 ++
 .../dt-style-selftest/bad/dts-property-name.dts    |  28 +
 .../dt-style-selftest/bad/dts-property-order.dts   |  15 +
 .../dt-style-selftest/bad/dts-property-order.dtso  |  59 ++
 .../bad/dts-redundant-ws-strict.dts                |  27 +
 .../dtc/dt-style-selftest/bad/dts-redundant-ws.dts |  28 +
 .../dt-style-selftest/bad/dts-redundant-ws.dtso    |   9 +
 .../dtc/dt-style-selftest/bad/dts-trailing-ws.dts  |   8 +
 .../dtc/dt-style-selftest/bad/dts-unused-label.dts |  21 +
 .../bad/yaml-child-addr-order.yaml                 |   2 +-
 .../bad/yaml-child-name-order.yaml                 |   2 +-
 .../dtc/dt-style-selftest/bad/yaml-cont-align.yaml |   8 +-
 .../bad/yaml-digit-node-order.yaml                 |   2 +-
 .../dtc/dt-style-selftest/bad/yaml-hex-case.yaml   |   2 +-
 .../dt-style-selftest/bad/yaml-indent-strict.yaml  |   2 +-
 .../bad/yaml-label-in-string.yaml                  |   2 +-
 .../dt-style-selftest/bad/yaml-line-length.yaml    |   2 +-
 .../dt-style-selftest/bad/yaml-mixed-indent.yaml   |   4 +-
 .../dt-style-selftest/bad/yaml-multi-close.yaml    |   2 +-
 .../dtc/dt-style-selftest/bad/yaml-node-close.yaml |   2 +-
 .../dtc/dt-style-selftest/bad/yaml-node-name.yaml  |  54 ++
 .../bad/yaml-prop-order-device-type.yaml           |   2 +-
 .../dtc/dt-style-selftest/bad/yaml-prop-order.yaml |   2 +-
 .../dt-style-selftest/bad/yaml-prop-pairing.yaml   |   2 +-
 .../dt-style-selftest/bad/yaml-property-name.yaml  |  46 ++
 .../bad/yaml-redundant-ws-strict.yaml              |  31 +
 .../dt-style-selftest/bad/yaml-redundant-ws.yaml   |  35 +
 .../dt-style-selftest/bad/yaml-required-blank.yaml |   2 +-
 scripts/dtc/dt-style-selftest/bad/yaml-tab.yaml    |   2 +-
 .../bad/yaml-trailing-comment.yaml                 |   2 +-
 .../dt-style-selftest/bad/yaml-trailing-ws.yaml    |   2 +-
 .../bad/yaml-unclosed-comment.yaml                 |   2 +-
 .../bad/yaml-unit-addr-prefix.yaml                 |   2 +-
 .../dtc/dt-style-selftest/bad/yaml-unit-addr.yaml  |   2 +-
 .../dt-style-selftest/bad/yaml-unused-label.yaml   |   2 +-
 .../bad/yaml-value-ws-multiline.yaml               |   2 +-
 .../dtc/dt-style-selftest/bad/yaml-value-ws.yaml   |   2 +-
 .../expected/dts-child-name-order.dts.txt          |   1 +
 .../expected/dts-child-name-order.dtso.txt         |   3 +
 .../expected/dts-cont-align.dts.txt                |  10 +
 .../expected/dts-digit-node-order.dts.txt          |   2 +
 .../expected/dts-digit-node-order.dtso.txt         |   2 +
 .../dts-extend-node-child-name-order.dtso.txt      |   2 +
 .../dts-extend-node-digit-node-order.dtso.txt      |   2 +
 .../expected/dts-line-length.dts.txt               |   2 +
 .../expected/dts-mixed-indent.dts.txt              |   1 +
 .../expected/dts-node-name.dts.txt                 |  13 +
 .../expected/dts-property-name.dts.txt             |  14 +
 .../expected/dts-property-order.dts.txt            |  15 +-
 .../expected/dts-property-order.dtso.txt           |  11 +
 .../expected/dts-redundant-ws-strict.dts.txt       |  13 +
 .../expected/dts-redundant-ws.dts.txt              |  10 +
 .../expected/dts-redundant-ws.dtso.txt             |   2 +
 .../expected/dts-trailing-ws.dts.txt               |   2 +
 .../expected/dts-unused-label.dts.txt              |   2 +
 .../expected/yaml-cont-align.yaml.txt              |   3 +-
 .../expected/yaml-mixed-indent.yaml.txt            |   1 +
 .../expected/yaml-node-name.yaml.txt               |   7 +
 .../expected/yaml-property-name.yaml.txt           |  14 +
 .../expected/yaml-redundant-ws-strict.yaml.txt     |   5 +
 .../expected/yaml-redundant-ws.yaml.txt            |   4 +
 .../expected/yaml-value-ws-multiline.yaml.txt      |   1 +
 .../good/dts-child-name-order.dtso                 |  44 ++
 .../dtc/dt-style-selftest/good/dts-cont-align.dts  |  13 +-
 .../good/dts-digit-node-order.dts                  |   3 -
 .../good/dts-digit-node-order.dtso                 |  59 ++
 .../good/dts-extend-node-child-name-order.dtso     |  26 +
 .../good/dts-extend-node-digit-node-order.dtso     |  34 +
 .../dt-style-selftest/good/dts-property-order.dts  |   5 +
 .../dt-style-selftest/good/dts-property-order.dtso |  47 ++
 .../dtc/dt-style-selftest/good/yaml-4space.yaml    |   2 +-
 .../dt-style-selftest/good/yaml-cont-align.yaml    |  32 +
 .../good/yaml-tricky-parsing.yaml                  |   2 +-
 scripts/dtc/dt-style-selftest/run.sh               |   2 +-
 108 files changed, 1797 insertions(+), 543 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,g3dsys.txt
 delete mode 100644 Documentation/devicetree/bindings/arm/omap/mpu.txt
 create mode 100644 Documentation/devicetree/bindings/arm/ti/ti,omap-mpu.yaml
 delete mode 100644 Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
 create mode 100644 Documentation/devicetree/bindings/bus/ti,omap-ocp2scp.yaml
 create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mediatek,mt2701-g3dsys.yaml
 create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-child-name-order.dtso
 create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-cont-align.dts
 create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-digit-node-order.dts
 create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-digit-node-order.dtso
 create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-extend-node-child-name-order.dtso
 create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-extend-node-digit-node-order.dtso
 create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-line-length.dts
 create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-node-name.dts
 create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-property-name.dts
 create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-property-order.dtso
 create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-redundant-ws-strict.dts
 create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-redundant-ws.dts
 create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-redundant-ws.dtso
 create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-trailing-ws.dts
 create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-unused-label.dts
 create mode 100644 scripts/dtc/dt-style-selftest/bad/yaml-node-name.yaml
 create mode 100644 scripts/dtc/dt-style-selftest/bad/yaml-property-name.yaml
 create mode 100644 scripts/dtc/dt-style-selftest/bad/yaml-redundant-ws-strict.yaml
 create mode 100644 scripts/dtc/dt-style-selftest/bad/yaml-redundant-ws.yaml
 create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-child-name-order.dtso.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-cont-align.dts.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-digit-node-order.dts.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-digit-node-order.dtso.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-extend-node-child-name-order.dtso.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-extend-node-digit-node-order.dtso.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-line-length.dts.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-node-name.dts.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-property-name.dts.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-property-order.dtso.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-redundant-ws-strict.dts.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-redundant-ws.dts.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-redundant-ws.dtso.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-trailing-ws.dts.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-unused-label.dts.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/yaml-node-name.yaml.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/yaml-property-name.yaml.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/yaml-redundant-ws-strict.yaml.txt
 create mode 100644 scripts/dtc/dt-style-selftest/expected/yaml-redundant-ws.yaml.txt
 create mode 100644 scripts/dtc/dt-style-selftest/good/dts-child-name-order.dtso
 create mode 100644 scripts/dtc/dt-style-selftest/good/dts-digit-node-order.dtso
 create mode 100644 scripts/dtc/dt-style-selftest/good/dts-extend-node-child-name-order.dtso
 create mode 100644 scripts/dtc/dt-style-selftest/good/dts-extend-node-digit-node-order.dtso
 create mode 100644 scripts/dtc/dt-style-selftest/good/dts-property-order.dtso
 create mode 100644 scripts/dtc/dt-style-selftest/good/yaml-cont-align.yaml
Merging dt-krzk/for-next (6bd34d56818cc Merge branches 'next/dt' and 'next/dt64' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next
Merge made by the 'ort' strategy.
Merging mailbox/for-next (14af7a96afa39 mailbox: add Axiado AX3005 mailbox driver)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next
Already up to date.
Merging spi/for-next (5f01cb141169f spi: omap2-mcspi: Remove unbalanced pm_runtime_put_sync() calls)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next
Merge made by the 'ort' strategy.
 drivers/spi/Kconfig              | 364 +++++++++++++++++++--------------------
 drivers/spi/spi-geni-qcom.c      |  15 +-
 drivers/spi/spi-omap2-mcspi.c    |   2 -
 drivers/spi/spi-sh-msiof.c       |   5 +-
 drivers/spi/spi-sunplus-sp7021.c |  13 +-
 drivers/spi/spi-virtio.c         |   2 -
 6 files changed, 197 insertions(+), 204 deletions(-)
Merging tip/master (e3ee95a890f52 Merge branch into tip/master: 'x86/tdx')
$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master
Auto-merging Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.yaml
Auto-merging arch/Kconfig
Auto-merging arch/arm64/Kconfig
Auto-merging arch/arm64/configs/defconfig
Auto-merging arch/loongarch/Kconfig
Auto-merging arch/powerpc/Kconfig
Auto-merging arch/riscv/Kconfig
Auto-merging arch/s390/Kconfig
Auto-merging arch/x86/Kconfig
Auto-merging include/linux/sched.h
Merge made by the 'ort' strategy.
 Documentation/arch/x86/tdx.rst                     |  21 +
 .../bindings/interrupt-controller/qcom,pdc.yaml    |   1 +
 arch/Kconfig                                       |  38 --
 arch/arm64/Kconfig                                 |   1 -
 arch/arm64/boot/dts/qcom/purwa.dtsi                |   5 +
 arch/arm64/configs/defconfig                       |   2 -
 arch/arm64/include/asm/preempt.h                   |  10 -
 arch/arm64/kernel/paravirt.c                       |   4 +-
 arch/loongarch/Kconfig                             |   1 -
 arch/loongarch/kernel/paravirt.c                   |   4 +-
 arch/powerpc/Kconfig                               |   1 -
 arch/powerpc/platforms/pseries/setup.c             |   4 +-
 arch/riscv/Kconfig                                 |   1 -
 arch/riscv/include/asm/smp.h                       |  12 +
 arch/riscv/kernel/paravirt.c                       |   4 +-
 arch/riscv/kernel/sbi-ipi.c                        |   4 +-
 arch/riscv/kernel/smp.c                            |  12 -
 arch/s390/Kconfig                                  |   1 -
 arch/s390/include/asm/preempt.h                    |  11 -
 arch/x86/Kconfig                                   |   1 -
 arch/x86/boot/early_serial_console.c               |  13 +-
 arch/x86/include/asm/cpufeatures.h                 |   1 +
 arch/x86/include/asm/kvm-x86-ops.h                 |   1 +
 arch/x86/include/asm/kvm_host.h                    |   1 +
 arch/x86/include/asm/preempt.h                     |  28 --
 arch/x86/include/asm/tdx.h                         |  23 ++
 arch/x86/include/asm/tdx_global_metadata.h         |   9 +-
 arch/x86/kernel/cpu/bugs.c                         |  18 +-
 arch/x86/kernel/cpu/scattered.c                    |   1 +
 arch/x86/kernel/cpu/sgx/main.c                     |   8 +-
 arch/x86/kernel/cpu/vmware.c                       |   4 +-
 arch/x86/kernel/crash.c                            |   6 +-
 arch/x86/kernel/kvm.c                              |   4 +-
 arch/x86/kernel/shstk.c                            |   2 +-
 arch/x86/kvm/mmu/mmu.c                             |   4 +
 arch/x86/kvm/vmx/tdx.c                             |  99 +++--
 arch/x86/kvm/vmx/tdx.h                             |   2 +
 arch/x86/virt/vmx/tdx/tdx.c                        | 434 ++++++++++++++++++---
 arch/x86/virt/vmx/tdx/tdx.h                        |   2 +
 arch/x86/virt/vmx/tdx/tdx_global_metadata.c        |  23 +-
 drivers/clocksource/timer-clint.c                  |   4 +-
 drivers/irqchip/Kconfig                            |   6 +-
 drivers/irqchip/irq-aclint-sswi.c                  |   4 +-
 drivers/irqchip/irq-gic-v3.c                       |  10 +-
 drivers/irqchip/irq-gic-v5.c                       |   9 +-
 drivers/irqchip/irq-gic.c                          |   8 +-
 drivers/irqchip/irq-riscv-imsic-early.c            |   4 +-
 drivers/irqchip/irq-riscv-imsic-state.c            |  13 +-
 drivers/irqchip/irq-riscv-imsic-state.h            |   1 -
 drivers/irqchip/qcom-pdc.c                         |   3 +
 drivers/xen/time.c                                 |   4 +-
 include/asm-generic/preempt.h                      |  10 -
 include/linux/irq-entry-common.h                   |  17 +-
 include/linux/kernel.h                             |  20 -
 include/linux/preempt.h                            |  20 +-
 include/linux/sched.h                              |  31 +-
 include/linux/sched/cputime.h                      |   6 +-
 kernel/Kconfig.kexec                               |   2 +-
 kernel/Kconfig.preempt                             |   9 +-
 kernel/crash_core.c                                |   2 +-
 kernel/entry/common.c                              |  17 +-
 kernel/irq/irqdesc.c                               |  10 +-
 kernel/sched/core.c                                | 221 ++---------
 kernel/sched/cputime.c                             |   4 +-
 kernel/sched/deadline.c                            |   2 +-
 kernel/sched/debug.c                               |  20 +-
 kernel/sched/fair.c                                |  16 +-
 kernel/sched/sched.h                               |  38 +-
 kernel/softirq.c                                   |   4 +-
 69 files changed, 735 insertions(+), 601 deletions(-)
Merging kexec/kexec-next (c6ed7331aad89 Merge branch 'kexec-7.4.hwpoison' into kexec-next)
$ git merge -m Merge branch 'kexec-next' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git kexec/kexec-next
Auto-merging include/linux/mm.h
Merge made by the 'ort' strategy.
 include/linux/mm.h  | 14 ++++++++++++++
 kernel/kexec_core.c | 10 ++++++++++
 kernel/kexec_file.c | 20 +++++++++++++++++++-
 mm/memory-failure.c | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 1 deletion(-)
Merging liveupdate/next (c65687600ed07 Merge branch 'luo-internal-api' into next)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git liveupdate/next
Merge made by the 'ort' strategy.
 include/linux/liveupdate.h         | 22 ++++++++++++
 kernel/liveupdate/kexec_handover.c |  7 ++++
 kernel/liveupdate/luo_file.c       | 69 ++++++++++++++++++++++++++++++++++++++
 kernel/liveupdate/luo_internal.h   | 17 ++++++++++
 4 files changed, 115 insertions(+)
Merging clockevents/timers/drivers/next (1b8b356b4b06e clocksource/drivers/armada: Unwind timer clock on init failure)
$ git merge -m Merge branch 'timers/drivers/next' of https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git clockevents/timers/drivers/next
Auto-merging drivers/pwm/pwm-samsung.c
Merge made by the 'ort' strategy.
Merging edac/edac-for-next (9fa765b3ed33d Merge ras/edac-misc into for-next)
$ git merge -m Merge branch 'edac-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next
Merge made by the 'ort' strategy.
 drivers/edac/altera_edac.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
Merging ftrace/for-next (3df3ae98c30c2 Merge tracefs/for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next
Merge made by the 'ort' strategy.
$ git am -3 ../patches/0001-ftrace-Fix-semantic-conflict-with-mm-tree.patch
Applying: ftrace: Fix semantic conflict with mm tree
Using index info to reconstruct a base tree...
M	kernel/trace/trace_printk.c
Falling back to patching base and 3-way merge...
Auto-merging kernel/trace/trace_printk.c
No changes -- Patch already applied.
Merging rcu/next (9cc63f8bcd560 Merge branches 'expcb.2026.07.24a', 'misc.2026.07.30a', 'rcu-tasks.2026.07.30a', 'srcu.2026.08.11a' and 'torture.2026.08.14a' into HEAD)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux rcu/next
Already up to date.
Merging paulmck/non-rcu/next (85f4ab0da7887 Merge branch 'csd-lock.2026.08.23a', tag 'scftorture.2026.08.18a' into HEAD)
$ git merge -m Merge branch 'non-rcu/next' of https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next
Auto-merging kernel/smp.c
CONFLICT (content): Merge conflict in kernel/smp.c
Auto-merging lib/Kconfig.debug
Auto-merging lib/Makefile
Resolved 'kernel/smp.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 8a0a8db464752] Merge branch 'non-rcu/next' of https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
$ git diff -M --stat --summary HEAD^..
 kernel/smp.c        |  77 +++++++++++++++--------
 lib/Kconfig.debug   |  12 ++++
 lib/Makefile        |   1 +
 lib/test_csd_lock.c | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 237 insertions(+), 26 deletions(-)
 create mode 100644 lib/test_csd_lock.c
Merging kvm/next (d4b7fb647204f Merge branch 'kvm-xen-longmode' into HEAD)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
Auto-merging arch/x86/include/asm/kvm_host.h
Merge made by the 'ort' strategy.
 arch/x86/include/asm/kvm_host.h |   3 +-
 arch/x86/kvm/xen.c              | 212 ++++++++++++++++++++++++----------------
 arch/x86/kvm/xen.h              |   5 +
 include/linux/kvm_host.h        |   2 +
 virt/kvm/kvm_main.c             |  10 ++
 virt/kvm/pfncache.c             |  18 ++--
 6 files changed, 157 insertions(+), 93 deletions(-)
$ git am -3 ../patches/kvm-x86-static-cpu-has
Applying: Signed-off-by: Mark Brown <broonie@kernel.org>
Using index info to reconstruct a base tree...
M	arch/x86/kvm/msrs.c
Falling back to patching base and 3-way merge...
Auto-merging arch/x86/kvm/msrs.c
No changes -- Patch already applied.
Merging kvm-arm/next (aa8e5dc6a7a2a Merge branch 'kvm-arm64/misc-7.3' into next)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next
Already up to date.
Merging kvms390/next (dd6f4ef6f8a37 s390/vfio-ap: Fix NULL deref in status_show() during queue probe)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next
Already up to date.
Merging kvm-ppc/topic/ppc-kvm (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm
Already up to date.
Merging kvm-riscv/riscv_kvm_next (b5060a4aa33d7 RISC-V: KVM: fix vcpu vector context handling for kernel-mode vector)
$ 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 (76671054f9a1f Merge tag 'kvmarm-7.3' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next
Already up to date.
$ git am -3 ../patches/0001-KVM-selftests-Fix-up-semantic-changes.patch
Applying: KVM: selftests: Fix up semantic changes
Using index info to reconstruct a base tree...
M	tools/testing/selftests/kvm/lib/kvm_util.c
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/kvm/lib/kvm_util.c
No changes -- Patch already applied.
Merging xen-tip/linux-next (d330fb86a7170 xenbus: Unregister reboot notifier on init failure)
$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next
Already up to date.
Merging percpu/for-next (8f0b4cce4481f Linux 6.19-rc1)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next
Already up to date.
Merging workqueues/for-next (8bbd858c4710f workqueue: Add workqueue_bh_budget_yield tracepoint)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next
Auto-merging kernel/workqueue.c
Merge made by the 'ort' strategy.
 include/trace/events/workqueue.h | 146 +++++++++++++++++++++++++++++
 kernel/workqueue.c               | 192 +++++++++++++++++++++------------------
 2 files changed, 251 insertions(+), 87 deletions(-)
Merging sched-ext/for-next (5d5b04dfa9b1f Merge branch 'for-7.3-fixes' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next
Auto-merging kernel/sched/ext/ext.c
Auto-merging kernel/sched/ext/sub.c
Merge made by the 'ort' strategy.
 include/linux/sched/ext.h        |   4 +-
 kernel/sched/ext/ext.c           | 108 ++++++++++++++++++----------
 kernel/sched/ext/idle.c          |  25 +++++--
 kernel/sched/ext/internal.h      |  28 ++++++++
 kernel/sched/ext/sub.c           |   5 ++
 tools/sched_ext/scx_flatcg.bpf.c |   2 +-
 tools/sched_ext/scx_qmap.bpf.c   | 150 ++++++++++++++++++++++++++-------------
 tools/sched_ext/scx_qmap.h       |   3 +
 8 files changed, 234 insertions(+), 91 deletions(-)
Merging drivers-x86/for-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-next' of https://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 (5859f97c6f404 platform/chrome: cros_ec_rpmsg: Fix repeated word 'from' in comment)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next
Merge made by the 'ort' strategy.
 drivers/platform/chrome/cros_ec_ishtp.c        |   2 +-
 drivers/platform/chrome/cros_ec_proto.c        |  43 +++++--
 drivers/platform/chrome/cros_ec_proto_test.c   | 158 ++++++++++++++++++++++++-
 drivers/platform/chrome/cros_ec_rpmsg.c        |   2 +-
 drivers/platform/chrome/cros_usbpd_notify.c    |   4 +-
 include/linux/platform_data/cros_ec_commands.h |  72 +++++++++++
 6 files changed, 262 insertions(+), 19 deletions(-)
Merging chrome-platform-firmware/for-firmware-next (44e33a5aaa2de firmware: Rename google firmware directory to coreboot)
$ git merge -m Merge branch 'for-firmware-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 MAINTAINERS                                        | 20 +++---
 drivers/firmware/Kconfig                           |  2 +-
 drivers/firmware/Makefile                          |  2 +-
 drivers/firmware/{google => coreboot}/Kconfig      | 74 ++++++++++++++++------
 drivers/firmware/{google => coreboot}/Makefile     | 10 +--
 drivers/firmware/{google => coreboot}/cbmem.c      |  0
 .../firmware/{google => coreboot}/coreboot_table.c |  0
 .../firmware/{google => coreboot}/coreboot_table.h |  0
 .../{google => coreboot}/framebuffer-coreboot.c    |  0
 drivers/firmware/{google => coreboot}/gsmi.c       |  0
 .../{google => coreboot}/memconsole-coreboot.c     |  0
 .../{google => coreboot}/memconsole-x86-legacy.c   |  0
 drivers/firmware/{google => coreboot}/memconsole.c |  0
 drivers/firmware/{google => coreboot}/memconsole.h |  6 +-
 drivers/firmware/{google => coreboot}/vpd.c        |  0
 drivers/firmware/{google => coreboot}/vpd_decode.c |  0
 drivers/firmware/{google => coreboot}/vpd_decode.h |  0
 17 files changed, 76 insertions(+), 38 deletions(-)
 rename drivers/firmware/{google => coreboot}/Kconfig (64%)
 rename drivers/firmware/{google => coreboot}/Makefile (51%)
 rename drivers/firmware/{google => coreboot}/cbmem.c (100%)
 rename drivers/firmware/{google => coreboot}/coreboot_table.c (100%)
 rename drivers/firmware/{google => coreboot}/coreboot_table.h (100%)
 rename drivers/firmware/{google => coreboot}/framebuffer-coreboot.c (100%)
 rename drivers/firmware/{google => coreboot}/gsmi.c (100%)
 rename drivers/firmware/{google => coreboot}/memconsole-coreboot.c (100%)
 rename drivers/firmware/{google => coreboot}/memconsole-x86-legacy.c (100%)
 rename drivers/firmware/{google => coreboot}/memconsole.c (100%)
 rename drivers/firmware/{google => coreboot}/memconsole.h (82%)
 rename drivers/firmware/{google => coreboot}/vpd.c (100%)
 rename drivers/firmware/{google => coreboot}/vpd_decode.c (100%)
 rename drivers/firmware/{google => coreboot}/vpd_decode.h (100%)
Merging hsi/for-next (e81250ec6b692 hsi: omap_ssi_core: fix missing DMA mask setup for SSI controller device)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next
Already up to date.
Merging leds-lj/for-leds-next (4805e5ec50d0b leds: max77705: Use fwnode_for_each_child_node_scoped() in max77705_add_led())
$ git merge -m Merge branch 'for-leds-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next
Merge made by the 'ort' strategy.
 drivers/leds/leds-max77705.c |  3 +-
 drivers/leds/leds-st1202.c   | 89 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 2 deletions(-)
Merging ipmi/for-next (89a312991dc6e Merge tag 'cifs-fixes-7.3-rc2' of https://git.manguebit.org/linux)
$ git merge -m Merge branch 'for-next' of https://github.com/cminyard/linux-ipmi.git ipmi/for-next
Already up to date.
Merging driver-core/driver-core-next (88b79bffa3779 Merge patch series "rust: io: support register projections and remove relative registers")
$ git merge -m Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core/driver-core-next
Merge made by the 'ort' strategy.
Merging usb/usb-next (edc1518454f64 usb: typec: hd3ss3220: Add support for supply regulators)
$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next
Auto-merging arch/arm/boot/dts/st/stm32mp131.dtsi
Auto-merging arch/arm/boot/dts/st/stm32mp151.dtsi
Auto-merging drivers/usb/dwc3/dwc3-google.c
Auto-merging drivers/usb/typec/hd3ss3220.c
Merge made by the 'ort' strategy.
 .../devicetree/bindings/usb/generic-ehci.yaml      | 24 ++++++++
 .../devicetree/bindings/usb/generic-ohci.yaml      | 24 ++++++++
 .../devicetree/bindings/usb/gpio-sbu-mux.yaml      |  1 +
 .../devicetree/bindings/usb/qcom,snps-dwc3.yaml    | 19 +++++++
 .../devicetree/bindings/usb/ti,hd3ss3220.yaml      | 11 ++++
 arch/arm/boot/dts/st/stm32mp131.dtsi               |  4 +-
 arch/arm/boot/dts/st/stm32mp151.dtsi               |  4 +-
 arch/arm64/boot/dts/st/stm32mp231.dtsi             | 64 ++++++++++++++++++++++
 arch/arm64/boot/dts/st/stm32mp251.dtsi             | 63 +++++++++++++++++++++
 drivers/usb/cdns3/core.c                           |  4 +-
 drivers/usb/cdns3/drd.c                            |  4 +-
 drivers/usb/common/usb-conn-gpio.c                 |  8 +--
 drivers/usb/dwc2/gadget.c                          |  4 +-
 drivers/usb/dwc3/debugfs.c                         |  6 +-
 drivers/usb/dwc3/dwc3-google.c                     |  4 +-
 drivers/usb/dwc3/dwc3-imx.c                        |  2 +-
 drivers/usb/dwc3/dwc3-imx8mp.c                     |  4 +-
 drivers/usb/dwc3/dwc3-keystone.c                   |  5 +-
 drivers/usb/dwc3/dwc3-omap.c                       |  5 +-
 drivers/usb/dwc3/dwc3-qcom.c                       | 15 +++++
 drivers/usb/gadget/udc/aspeed-vhub/core.c          |  4 +-
 drivers/usb/gadget/udc/aspeed_udc.c                |  4 +-
 drivers/usb/gadget/udc/atmel_usba_udc.c            |  5 +-
 drivers/usb/gadget/udc/r8a66597-udc.c              |  4 +-
 drivers/usb/gadget/udc/renesas_usbf.c              |  8 +--
 drivers/usb/gadget/udc/snps_udc_plat.c             |  4 +-
 drivers/usb/gadget/udc/tegra-xudc.c                |  5 +-
 drivers/usb/host/xhci-tegra.c                      |  8 +--
 drivers/usb/misc/brcmstb-usb-pinmap.c              |  9 +--
 drivers/usb/misc/qcom_eud.c                        |  2 +-
 drivers/usb/mtu3/mtu3_core.c                       |  4 +-
 drivers/usb/phy/phy-ab8500-usb.c                   | 12 +---
 drivers/usb/phy/phy-generic.c                      |  3 +-
 drivers/usb/phy/phy-gpio-vbus-usb.c                |  5 +-
 drivers/usb/renesas_usbhs/mod.c                    |  4 +-
 drivers/usb/typec/anx7411.c                        |  4 +-
 drivers/usb/typec/hd3ss3220.c                      | 36 +++++++++++-
 drivers/usb/typec/mux/gpio-sbu-mux.c               | 13 ++++-
 drivers/usb/typec/mux/it5205.c                     |  2 +-
 drivers/usb/typec/tcpm/tcpci_maxim_core.c          |  3 +-
 drivers/usb/typec/tcpm/tcpci_mt6360.c              |  1 -
 drivers/usb/typec/tcpm/tcpci_mt6370.c              |  2 +-
 42 files changed, 303 insertions(+), 114 deletions(-)
Merging thunderbolt/next (2d8b6e38b86c4 net: thunderbolt: Update ring indices only after all frames are queued)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next
Auto-merging drivers/thunderbolt/nhi.c
Auto-merging drivers/thunderbolt/switch.c
Auto-merging include/linux/thunderbolt.h
Merge made by the 'ort' strategy.
 drivers/net/thunderbolt/main.c |  6 +++--
 drivers/thunderbolt/dma_test.c | 10 ++++----
 drivers/thunderbolt/eeprom.c   | 23 ++++++++++++-----
 drivers/thunderbolt/nhi.c      | 58 ++++++++++++++++++++++++++++++++++++------
 drivers/thunderbolt/path.c     |  2 +-
 drivers/thunderbolt/quirks.c   | 18 +++++++++++++
 drivers/thunderbolt/switch.c   |  4 +++
 drivers/thunderbolt/tb.h       |  3 +++
 include/linux/thunderbolt.h    | 42 +++++++++++++++++++++++++++---
 9 files changed, 140 insertions(+), 26 deletions(-)
Merging usb-serial/usb-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next
Already up to date.
Merging tty/tty-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
Already up to date.
Merging char-misc/char-misc-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next
Already up to date.
Merging coresight/next (9e3604d7369cf coresight: etm4x: remove redundant fields in etmv4_save_state)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next
Already up to date.
Merging fastrpc/for-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next
Already up to date.
Merging fpga/for-next (4216e549a2657 fpga: dfl: fix spelling in sysfs-platform-dfl-port ABI documentation)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next
Already up to date.
Merging icc/icc-next (9621c81fd2eb7 Merge branch 'icc-misc' into icc-next)
$ git merge -m Merge branch 'icc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next
Already up to date.
Merging iio/togreg (309bd01041636 iio: adc: add MAX40080 current-sense amplifier driver)
$ git merge -m Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg
Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml
Auto-merging MAINTAINERS
Auto-merging drivers/iio/accel/kionix-kx022a.c
Auto-merging drivers/iio/adc/ade9000.c
CONFLICT (content): Merge conflict in drivers/iio/adc/ade9000.c
Auto-merging drivers/iio/buffer/industrialio-buffer-dmaengine.c
Auto-merging drivers/iio/pressure/rohm-bm1390.c
Auto-merging drivers/iio/proximity/aw96103.c
Resolved 'drivers/iio/adc/ade9000.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 15b72c6d38fbc] Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/iio/accel/adi,adxl367.yaml |  13 +-
 .../devicetree/bindings/iio/adc/adi,ad4130.yaml    |   3 +-
 .../devicetree/bindings/iio/adc/adi,ade9000.yaml   |  30 +-
 .../devicetree/bindings/iio/adc/adi,max40080.yaml  |  65 +++
 .../bindings/iio/adc/axiado,ax3000-saradc.yaml     |  63 +++
 .../devicetree/bindings/iio/adc/ti,ads1100.yaml    |  10 +-
 .../devicetree/bindings/iio/adc/ti,ads112c04.yaml  | 149 ++++++
 .../devicetree/bindings/iio/addac/adi,ad74115.yaml |   3 +-
 .../bindings/iio/addac/adi,ad74413r.yaml           |   3 +-
 .../bindings/iio/imu/invensense,icm42600.yaml      |  24 +-
 .../bindings/iio/light/liteon,ltr501.yaml          |  32 +-
 .../iio/proximity/pulsedlight,lidar-lite-v2.yaml   |  71 +++
 .../devicetree/bindings/trivial-devices.yaml       |   4 +-
 Documentation/iio/ade9000.rst                      |  26 +-
 Documentation/iio/adxl380.rst                      |   8 +-
 MAINTAINERS                                        |  30 ++
 drivers/iio/accel/adxl367.c                        |  59 ++-
 drivers/iio/accel/adxl380.c                        |   7 +
 drivers/iio/accel/bma400_core.c                    |   2 -
 drivers/iio/accel/kionix-kx022a.c                  |  20 +-
 drivers/iio/accel/mma8452.c                        | 145 ++----
 drivers/iio/adc/Kconfig                            |  57 +-
 drivers/iio/adc/Makefile                           |   3 +
 drivers/iio/adc/ad4080.c                           |  13 +-
 drivers/iio/adc/ade9000.c                          | 180 +++++--
 drivers/iio/adc/axiado_saradc.c                    | 277 ++++++++++
 drivers/iio/adc/bcm_iproc_adc.c                    |  46 +-
 drivers/iio/adc/max40080.c                         | 574 +++++++++++++++++++++
 drivers/iio/adc/meson_saradc.c                     |   2 +-
 drivers/iio/adc/pac1934.c                          |   9 +-
 drivers/iio/adc/rockchip_saradc.c                  |  16 +
 drivers/iio/adc/sophgo-cv1800b-adc.c               |   2 +
 drivers/iio/adc/ti-ads1100.c                       | 188 ++++++-
 drivers/iio/adc/ti-ads112c04.c                     | 524 +++++++++++++++++++
 drivers/iio/buffer/industrialio-buffer-dmaengine.c |   3 -
 drivers/iio/chemical/sps30.c                       |  11 +-
 .../iio/common/cros_ec_sensors/cros_ec_sensors.c   |   2 +-
 .../common/cros_ec_sensors/cros_ec_sensors_core.c  |   5 +-
 drivers/iio/frequency/adf4350.c                    |   2 +-
 drivers/iio/gyro/adxrs290.c                        |   4 +-
 drivers/iio/gyro/bmg160_core.c                     |   4 +-
 drivers/iio/gyro/itg3200_buffer.c                  |   3 +-
 drivers/iio/humidity/Kconfig                       |   8 +-
 drivers/iio/humidity/am2315.c                      |  34 +-
 drivers/iio/humidity/ens210.c                      |   4 +-
 drivers/iio/humidity/hts221_core.c                 | 168 +++---
 drivers/iio/humidity/hts221_i2c.c                  |  11 +-
 drivers/iio/humidity/hts221_spi.c                  |  11 +-
 drivers/iio/imu/inv_icm42600/inv_icm42600.h        |   4 +-
 drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c  |  16 +-
 drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 112 ++--
 drivers/iio/imu/inv_icm42600/inv_icm42600_core.c   |  17 +-
 drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c   |  16 +-
 drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c    |  16 +-
 drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c    |  16 +-
 drivers/iio/imu/inv_mpu6050/inv_mpu_core.c         |   6 +-
 drivers/iio/industrialio-core.c                    |   6 +-
 drivers/iio/industrialio-gts-helper.c              |   2 +-
 drivers/iio/light/apds9999.c                       |  12 +-
 drivers/iio/light/cros_ec_light_prox.c             |   2 +-
 drivers/iio/light/iqs621-als.c                     |  24 +-
 drivers/iio/light/isl29018.c                       |   7 +-
 drivers/iio/light/lm3533-als.c                     |  11 +-
 drivers/iio/light/ltr390.c                         |   6 -
 drivers/iio/light/ltr501.c                         | 109 ++--
 drivers/iio/light/tsl2583.c                        |  15 +-
 drivers/iio/light/tsl2772.c                        |  16 +-
 drivers/iio/light/vcnl4000.c                       |   3 +-
 drivers/iio/light/veml3328.c                       |  53 +-
 drivers/iio/position/iqs624-pos.c                  |  24 +-
 drivers/iio/pressure/cros_ec_baro.c                |   2 +-
 drivers/iio/pressure/rohm-bm1390.c                 |   4 +-
 drivers/iio/proximity/aw96103.c                    |   2 +-
 drivers/iio/temperature/tmp117.c                   |   9 +-
 .../iio/Documentation/sysfs-bus-iio-adc-ad7280a    |   2 +-
 drivers/staging/iio/frequency/ad9832.c             |   6 +
 drivers/staging/iio/frequency/ad9834.c             |   6 +
 include/linux/iio/iio-gts-helper.h                 |   1 +
 include/linux/iio/iio.h                            |   2 +-
 include/linux/notifier.h                           |   7 +
 kernel/notifier.c                                  | 105 ++++
 81 files changed, 2927 insertions(+), 640 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,max40080.yaml
 create mode 100644 Documentation/devicetree/bindings/iio/adc/axiado,ax3000-saradc.yaml
 create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads112c04.yaml
 create mode 100644 Documentation/devicetree/bindings/iio/proximity/pulsedlight,lidar-lite-v2.yaml
 create mode 100644 drivers/iio/adc/axiado_saradc.c
 create mode 100644 drivers/iio/adc/max40080.c
 create mode 100644 drivers/iio/adc/ti-ads112c04.c
Merging nfc/for-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-next' of https://codeberg.org/linux-nfc/linux.git nfc/for-next
Already up to date.
Merging phy-next/next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next
Already up to date.
Merging soundwire/next (1d4d3198ccce1 soundwire: intel_auxdevice: add tac5xx2 family to wake_capable_list)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next
Auto-merging drivers/soundwire/dmi-quirks.c
Merge made by the 'ort' strategy.
 drivers/soundwire/bus_type.c        | 16 +++++++++++-----
 drivers/soundwire/dmi-quirks.c      |  7 +++++++
 drivers/soundwire/intel_auxdevice.c |  4 +++-
 3 files changed, 21 insertions(+), 6 deletions(-)
Merging extcon/extcon-next (8d3ae59288f1e Linux 7.2)
$ git merge -m Merge branch 'extcon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next
Already up to date.
Merging gnss/gnss-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'gnss-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next
Already up to date.
Merging vfio/next (4e3c1fc8abcb8 vfio/pci: Remove the pcie check for VFIO_PCI_ERR_IRQ_INDEX)
$ git merge -m Merge branch 'next' of https://github.com/awilliam/linux-vfio.git vfio/next
Already up to date.
Merging w1/for-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next
Already up to date.
Merging spmi/spmi-next (8cdeaa50eae8d Linux 7.2-rc2)
$ git merge -m Merge branch 'spmi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next
Already up to date.
Merging staging/staging-next (758be99c46265 staging: rtl8723bs: avoid CamelCase in rtw_efuse)
$ git merge -m Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next
Auto-merging drivers/staging/rtl8723bs/core/rtw_mlme.c
Auto-merging drivers/staging/sm750fb/sm750.c
Auto-merging drivers/staging/sm750fb/sm750_accel.h
Merge made by the 'ort' strategy.
 drivers/staging/axis-fifo/axis-fifo.c              |   6 +-
 drivers/staging/fbtft/fb_bd663474.c                |   4 +-
 drivers/staging/greybus/loopback.c                 |   5 +-
 drivers/staging/most/video/video.c                 |   1 -
 drivers/staging/octeon/ethernet-tx.c               |   2 +-
 drivers/staging/rtl8723bs/core/rtw_ap.c            |   2 +-
 drivers/staging/rtl8723bs/core/rtw_cmd.c           |  25 +-
 drivers/staging/rtl8723bs/core/rtw_efuse.c         | 147 +---
 drivers/staging/rtl8723bs/core/rtw_mlme.c          | 966 +++++++++++----------
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c      |  13 +-
 drivers/staging/rtl8723bs/core/rtw_recv.c          |  49 +-
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c     |   6 +-
 drivers/staging/rtl8723bs/core/rtw_xmit.c          |  48 +-
 drivers/staging/rtl8723bs/hal/HalPhyRf.c           |   3 +-
 drivers/staging/rtl8723bs/hal/hal_com.c            |   6 +-
 drivers/staging/rtl8723bs/hal/hal_intf.c           |   9 +-
 drivers/staging/rtl8723bs/hal/odm.h                |   9 -
 drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h |   1 -
 drivers/staging/rtl8723bs/hal/odm_precomp.h        |   1 -
 drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c    |   2 +-
 drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c     |   3 +-
 drivers/staging/rtl8723bs/hal/sdio_halinit.c       |  24 -
 drivers/staging/rtl8723bs/include/basic_types.h    |   3 -
 drivers/staging/rtl8723bs/include/cmd_osdep.h      |   6 +-
 drivers/staging/rtl8723bs/include/hal_com.h        |   2 +-
 drivers/staging/rtl8723bs/include/hal_data.h       |   3 -
 drivers/staging/rtl8723bs/include/hal_intf.h       |   2 +-
 drivers/staging/rtl8723bs/include/hal_phy.h        |  16 -
 drivers/staging/rtl8723bs/include/osdep_service.h  |   4 +-
 .../rtl8723bs/include/osdep_service_linux.h        |   2 +-
 drivers/staging/rtl8723bs/include/rtl8723b_hal.h   |   2 +-
 drivers/staging/rtl8723bs/include/rtw_cmd.h        |  58 +-
 drivers/staging/rtl8723bs/include/rtw_efuse.h      |   5 +-
 drivers/staging/rtl8723bs/include/rtw_io.h         |  14 +-
 drivers/staging/rtl8723bs/include/rtw_ioctl_set.h  |   2 -
 drivers/staging/rtl8723bs/include/rtw_mlme.h       |  78 +-
 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h   |  36 +-
 drivers/staging/rtl8723bs/include/rtw_pwrctrl.h    |  20 +-
 drivers/staging/rtl8723bs/include/rtw_recv.h       |  69 +-
 drivers/staging/rtl8723bs/include/rtw_xmit.h       |   8 +-
 drivers/staging/rtl8723bs/include/sdio_ops.h       |  21 +-
 drivers/staging/rtl8723bs/include/sta_info.h       |  84 +-
 drivers/staging/rtl8723bs/include/wlan_bssdef.h    |   8 +-
 drivers/staging/rtl8723bs/include/xmit_osdep.h     |  14 +-
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c  |  86 +-
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c       |   4 +-
 drivers/staging/sm750fb/sm750.c                    |  12 +-
 drivers/staging/sm750fb/sm750_accel.h              |   4 +-
 drivers/staging/vme_user/vme_tsi148.c              |   3 +-
 49 files changed, 879 insertions(+), 1019 deletions(-)
Merging counter-next/counter-next (353b2e09f44a9 counter: ti-eqep: Remove redundant dev_err_probe())
$ git merge -m Merge branch 'counter-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next
Already up to date.
Merging mux/for-next (ac7bde3c53166 mux: Add driver for Renesas RZ/V2H VBENCTL VBUS_SEL mux)
$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next
Merge made by the 'ort' strategy.
 drivers/mux/Kconfig         | 13 ++++++++
 drivers/mux/Makefile        |  2 ++
 drivers/mux/rzv2h-vbenctl.c | 81 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 drivers/mux/rzv2h-vbenctl.c
Merging dmaengine/next (256b61fdc708c dmaengine: dw-edma: Prepare LL kicks for event serialization)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next
Merge made by the 'ort' strategy.
 .../devicetree/bindings/dma/apple,admac.yaml       |  10 +-
 Documentation/driver-api/dmaengine/provider.rst    |   2 +-
 drivers/dma/amba-pl08x.c                           |   4 +-
 drivers/dma/apple-admac.c                          |  24 ++
 drivers/dma/at_hdmac.c                             |  46 +--
 drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c     |  28 +-
 drivers/dma/dw-axi-dmac/dw-axi-dmac.h              |   3 +-
 drivers/dma/dw-edma/dw-edma-core.c                 | 349 ++++++++++++++-------
 drivers/dma/dw-edma/dw-edma-core.h                 |  67 +++-
 drivers/dma/dw-edma/dw-edma-v0-core.c              |  59 ++--
 drivers/dma/dw-edma/dw-hdma-v0-core.c              |  59 ++--
 drivers/dma/fsl_raid.c                             |  24 +-
 drivers/dma/img-mdc-dma.c                          |   2 +-
 drivers/dma/mediatek/mtk-hsdma.c                   |  26 +-
 drivers/dma/pl330.c                                |   4 +-
 drivers/dma/sun6i-dma.c                            |  31 +-
 drivers/dma/txx9dmac.c                             |  16 +-
 drivers/dma/xilinx/xilinx_dma.c                    |  85 ++++-
 drivers/dma/xilinx/zynqmp_dma.c                    |  73 +++--
 include/linux/dma/edma.h                           |   2 +-
 include/linux/dma/imx-dma.h                        |   5 -
 21 files changed, 635 insertions(+), 284 deletions(-)
$ git reset --hard HEAD^
HEAD is now at 9ec18e9c52e1b Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git
Merging next-20260903 version of dmaengine
$ git merge -m next-20260903/dmaengine cee9395acd8043be0644b25c34bfa86623f2b935
Already up to date.
Merging cgroup/for-next (93fccdb0456d9 cgroup: namespace: Drop BUG_ON() in copy_cgroup_ns())
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next
Merge made by the 'ort' strategy.
 kernel/cgroup/namespace.c | 2 --
 1 file changed, 2 deletions(-)
Merging scsi/for-next (af8c27375733f scsi: megaraid_sas: Limit NVMe request size to the PRP chain frame)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next
Already up to date.
Merging scsi-mkp/for-next (e83b47309f733 scsi: core: Drop Scsi_Host.default_lock)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next
Auto-merging drivers/scsi/ibmvscsi/ibmvfc-core.c
Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c
Auto-merging drivers/scsi/scsi_scan.c
Merge made by the 'ort' strategy.
 Documentation/scsi/scsi_mid_low_api.rst   |   8 +-
 drivers/ata/libata-eh.c                   |   4 +-
 drivers/message/fusion/mptfc.c            |   8 +-
 drivers/s390/scsi/zfcp_erp.c              |  30 +--
 drivers/s390/scsi/zfcp_sysfs.c            |   4 +-
 drivers/scsi/3w-9xxx.c                    |  20 +-
 drivers/scsi/3w-sas.c                     |  28 +--
 drivers/scsi/3w-xxxx.c                    |  24 +--
 drivers/scsi/53c700.c                     |  16 +-
 drivers/scsi/BusLogic.c                   |  20 +-
 drivers/scsi/a100u2w.c                    |   4 +-
 drivers/scsi/a2091.c                      |   4 +-
 drivers/scsi/a3000.c                      |   4 +-
 drivers/scsi/aacraid/commsup.c            |   8 +-
 drivers/scsi/advansys.c                   |   8 +-
 drivers/scsi/aha1542.c                    |  20 +-
 drivers/scsi/aha1740.c                    |  12 +-
 drivers/scsi/arm/eesox.c                  |   8 +-
 drivers/scsi/arm/fas216.c                 |  20 +-
 drivers/scsi/atp870u.c                    |  12 +-
 drivers/scsi/bfa/bfad_bsg.c               |   4 +-
 drivers/scsi/csiostor/csio_attr.c         |   4 +-
 drivers/scsi/csiostor/csio_scsi.c         |   4 +-
 drivers/scsi/dc395x.c                     |   8 +-
 drivers/scsi/esp_scsi.c                   |  32 +--
 drivers/scsi/fcoe/fcoe.c                  |   4 +-
 drivers/scsi/fdomain.c                    |  16 +-
 drivers/scsi/gvp11.c                      |   4 +-
 drivers/scsi/hosts.c                      |  17 +-
 drivers/scsi/hptiop.c                     |   8 +-
 drivers/scsi/ibmvscsi/ibmvfc-core.c       | 262 ++++++++++++------------
 drivers/scsi/ibmvscsi/ibmvfc-nvme.c       |   8 +-
 drivers/scsi/ibmvscsi/ibmvscsi.c          |  86 ++++----
 drivers/scsi/imm.c                        |   4 +-
 drivers/scsi/initio.c                     |   8 +-
 drivers/scsi/ipr.c                        | 324 +++++++++++++++---------------
 drivers/scsi/ips.c                        |  26 +--
 drivers/scsi/libfc/fc_fcp.c               |   8 +-
 drivers/scsi/libsas/sas_scsi_host.c       |  10 +-
 drivers/scsi/lpfc/lpfc_els.c              |  30 +--
 drivers/scsi/lpfc/lpfc_hbadisc.c          |  44 ++--
 drivers/scsi/lpfc/lpfc_init.c             |  16 +-
 drivers/scsi/lpfc/lpfc_scsi.c             |   8 +-
 drivers/scsi/lpfc/lpfc_sli.c              |   4 +-
 drivers/scsi/mac53c94.c                   |   8 +-
 drivers/scsi/megaraid/megaraid_sas_base.c |  18 +-
 drivers/scsi/mesh.c                       |  24 +--
 drivers/scsi/mvumi.c                      |  26 +--
 drivers/scsi/nsp32.c                      |   8 +-
 drivers/scsi/pcmcia/sym53c500_cs.c        |   8 +-
 drivers/scsi/pmcraid.c                    |  84 ++++----
 drivers/scsi/qla1280.c                    |  44 ++--
 drivers/scsi/qla2xxx/qla_attr.c           |   4 +-
 drivers/scsi/qla2xxx/qla_init.c           |   4 +-
 drivers/scsi/qlogicfas408.c               |   8 +-
 drivers/scsi/qlogicpti.c                  |  20 +-
 drivers/scsi/scsi.c                       |  12 +-
 drivers/scsi/scsi_debugfs.c               |   2 +-
 drivers/scsi/scsi_devinfo.c               |   5 +-
 drivers/scsi/scsi_error.c                 |  70 +++----
 drivers/scsi/scsi_lib.c                   |  46 ++---
 drivers/scsi/scsi_proc.c                  |   9 +-
 drivers/scsi/scsi_scan.c                  |  16 +-
 drivers/scsi/scsi_sysfs.c                 |  28 +--
 drivers/scsi/scsi_transport_fc.c          | 136 ++++++-------
 drivers/scsi/sgiwd93.c                    |   4 +-
 drivers/scsi/snic/snic_disc.c             |  16 +-
 drivers/scsi/stex.c                       |  48 ++---
 drivers/scsi/sym53c8xx_2/sym_glue.c       |  56 +++---
 drivers/scsi/sym53c8xx_2/sym_hipd.h       |   4 +-
 drivers/scsi/wd33c93.c                    |   4 +-
 drivers/scsi/wd719x.c                     |  24 +--
 drivers/scsi/xen-scsifront.c              |  40 ++--
 drivers/target/target_core_file.c         |   4 +-
 drivers/target/target_core_pscsi.c        |  16 +-
 drivers/ufs/core/ufs-debugfs.c            |   4 +-
 drivers/ufs/core/ufs-sysfs.c              |  12 +-
 drivers/ufs/core/ufshcd.c                 | 152 +++++++-------
 drivers/ufs/host/ufs-mediatek.c           |   4 +-
 drivers/ufs/host/ufs-sprd.c               |   4 +-
 drivers/usb/storage/uas.c                 |  12 +-
 drivers/usb/storage/usb.h                 |   4 +-
 include/scsi/scsi_host.h                  |   9 +-
 83 files changed, 1097 insertions(+), 1101 deletions(-)
$ git am -3 ../patches/device-id-zorro
Applying: foofof
Using index info to reconstruct a base tree...
M	include/linux/device-id/zorro.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Merging vhost/linux-next (f49e6cf919425 virtio: synchronize callbacks after device reset)
$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next
Auto-merging MAINTAINERS
Auto-merging drivers/char/virtio_console.c
Auto-merging drivers/vhost/net.c
Merge made by the 'ort' strategy.
 MAINTAINERS                              |  13 +++-
 drivers/char/virtio_console.c            |  21 +++++-
 drivers/vdpa/alibaba/eni_vdpa.c          |   5 +-
 drivers/vdpa/ifcvf/ifcvf_main.c          |   3 +-
 drivers/vdpa/octeon_ep/octep_vdpa_main.c |   2 +
 drivers/vdpa/pds/vdpa_dev.c              |   6 ++
 drivers/vdpa/solidrun/snet_main.c        |   6 +-
 drivers/vdpa/vdpa_sim/vdpa_sim_blk.c     |   3 +-
 drivers/vdpa/vdpa_sim/vdpa_sim_net.c     |   7 +-
 drivers/vhost/net.c                      |   2 +
 drivers/vhost/vdpa.c                     | 111 ++++++++++++++++++++++++-------
 drivers/vhost/vhost.c                    |  91 +++++++++++++++++++++++--
 drivers/vhost/vhost.h                    |   4 ++
 drivers/vhost/vsock.c                    |   4 +-
 drivers/virtio/virtio.c                  |   4 +-
 drivers/virtio/virtio_balloon.c          |  49 +++++++++++---
 drivers/virtio/virtio_input.c            |   9 ++-
 drivers/virtio/virtio_mmio.c             |  16 ++++-
 drivers/virtio/virtio_pci_common.c       |   4 +-
 drivers/virtio/virtio_pci_legacy.c       |   2 -
 drivers/virtio/virtio_pci_modern.c       |   9 +--
 drivers/virtio/virtio_pci_modern_dev.c   |   8 ++-
 drivers/virtio/virtio_ring.c             |  38 +++++++++--
 drivers/virtio/virtio_vdpa.c             |   5 +-
 include/uapi/linux/virtio_config.h       |  16 +++++
 25 files changed, 369 insertions(+), 69 deletions(-)
Merging rpmsg/for-next (70e14d5db3a01 Merge branches 'rproc-next', 'rpmsg-next' and 'rproc-fixes' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next
Merge made by the 'ort' strategy.
 .../bindings/remoteproc/ti,am3352-wkup-m3.yaml     |   1 -
 Documentation/staging/rpmsg.rst                    |  17 +++
 drivers/remoteproc/imx_dsp_rproc.c                 |   7 +-
 drivers/remoteproc/imx_rproc.c                     |  51 ++-----
 drivers/remoteproc/qcom_q6v5_adsp.c                |  10 +-
 drivers/remoteproc/qcom_q6v5_mss.c                 |  11 +-
 drivers/remoteproc/qcom_q6v5_pas.c                 |  12 +-
 drivers/remoteproc/remoteproc_elf_loader.c         |  23 ++-
 drivers/remoteproc/stm32_rproc.c                   |   2 +-
 drivers/remoteproc/ti_k3_dsp_remoteproc.c          |   4 +
 drivers/remoteproc/ti_k3_r5_remoteproc.c           |   4 +
 drivers/remoteproc/xlnx_r5_remoteproc.c            |  13 +-
 drivers/rpmsg/virtio_rpmsg_bus.c                   | 156 ++++++++++++++-------
 include/linux/rpmsg/virtio_rpmsg.h                 |  41 ++++++
 include/uapi/linux/rpmsg.h                         |  15 +-
 samples/rpmsg/rpmsg_client_sample.c                |  20 ++-
 16 files changed, 276 insertions(+), 111 deletions(-)
 create mode 100644 include/linux/rpmsg/virtio_rpmsg.h
Merging gpio-brgl/gpio/for-next (4d305c2273123 gpio: mvebu: name regmaps to fix debugfs collisions)
$ git merge -m Merge branch 'gpio/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next
Auto-merging drivers/gpio/gpiolib-cdev.c
Merge made by the 'ort' strategy.
 .../devicetree/bindings/gpio/fsl,qoriq-gpio.yaml   |  7 ++
 .../bindings/gpio/nvidia,tegra186-gpio.yaml        |  9 +++
 Documentation/driver-api/gpio/board.rst            |  2 +-
 drivers/gpio/gpio-adp5585.c                        | 20 +-----
 drivers/gpio/gpio-altera.c                         |  5 +-
 drivers/gpio/gpio-eic-sprd.c                       | 17 +----
 drivers/gpio/gpio-mlxbf2.c                         |  4 +-
 drivers/gpio/gpio-mlxbf3.c                         |  4 +-
 drivers/gpio/gpio-mmio.c                           |  5 ++
 drivers/gpio/gpio-mvebu.c                          | 19 +++++-
 drivers/gpio/gpio-omap.c                           | 11 +---
 drivers/gpio/gpio-pcf857x.c                        | 16 ++++-
 drivers/gpio/gpio-realtek-otto.c                   | 16 ++++-
 drivers/gpio/gpio-rtd1625.c                        | 26 ++++----
 drivers/gpio/gpio-sloppy-logic-analyzer.c          |  4 +-
 drivers/gpio/gpio-tegra186.c                       | 74 ++++++++++++++++++++++
 drivers/gpio/gpiolib-acpi-quirks.c                 | 13 ++++
 drivers/gpio/gpiolib-cdev.c                        |  2 +
 drivers/gpio/gpiolib-kunit.c                       | 14 +---
 tools/gpio/gpio-hammer.c                           |  2 +-
 20 files changed, 192 insertions(+), 78 deletions(-)
Merging gpio-intel/for-next (32c7f7f80e5f7 gpio: crystalcove: add missing MODULE_ALIAS())
$ git merge -m Merge branch 'for-next' of https://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 (d067f0f4c96cb Merge tag 'pinctrl-qcom-updates-for-v7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next
Already up to date.
Merging pinctrl-intel/for-next (c016587866e57 pinctrl: intel: Try to retrieve driver data for pure platform drivers)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next
Merge made by the 'ort' strategy.
 drivers/pinctrl/intel/pinctrl-intel.c | 51 ++++++++++++++++++++++++-----------
 drivers/pinctrl/intel/pinctrl-intel.h |  2 +-
 2 files changed, 36 insertions(+), 17 deletions(-)
Merging pinctrl-renesas/renesas-pinctrl (ec5202ccfa247 pinctrl: renesas: rzg2l: Add RZ/G3S support for selecting I3C power source)
$ git merge -m Merge branch 'renesas-pinctrl' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl
Merge made by the 'ort' strategy.
 .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml    |   4 +-
 drivers/pinctrl/renesas/pinctrl-rzg2l.c            | 412 ++++++++++++++-------
 2 files changed, 286 insertions(+), 130 deletions(-)
Merging pinctrl-samsung/for-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
Already up to date.
Merging pinctrl-qcom/pinctrl-qcom/for-next (d4f74023be11e dt-bindings: pinctrl: qcom,sc8280xp-tlmm: allow gpio-line-names)
$ git merge -m Merge branch 'pinctrl-qcom/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pinctrl-qcom/pinctrl-qcom/for-next
Merge made by the 'ort' strategy.
 .../pinctrl/qcom,hawi-lpass-lpi-pinctrl.yaml       | 109 +++
 .../bindings/pinctrl/qcom,kuno-tlmm.yaml           | 110 +++
 .../bindings/pinctrl/qcom,pmic-gpio.yaml           |   3 +
 .../bindings/pinctrl/qcom,sc8280xp-tlmm.yaml       |   3 +
 drivers/pinctrl/qcom/Kconfig                       |  10 +
 drivers/pinctrl/qcom/Kconfig.msm                   |  11 +
 drivers/pinctrl/qcom/Makefile                      |   2 +
 drivers/pinctrl/qcom/pinctrl-hawi-lpass-lpi.c      | 244 +++++++
 drivers/pinctrl/qcom/pinctrl-kuno.c                | 801 +++++++++++++++++++++
 drivers/pinctrl/qcom/pinctrl-lpass-lpi.h           |  17 +
 drivers/pinctrl/qcom/pinctrl-spmi-gpio.c           |   1 +
 11 files changed, 1311 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,hawi-lpass-lpi-pinctrl.yaml
 create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,kuno-tlmm.yaml
 create mode 100644 drivers/pinctrl/qcom/pinctrl-hawi-lpass-lpi.c
 create mode 100644 drivers/pinctrl/qcom/pinctrl-kuno.c
Merging pwm/pwm/for-next (a662d944da1e9 pwm: ipq: Prevent potential 32-bit integer overflow in hi_div calculation)
$ git merge -m Merge branch 'pwm/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next
Merge made by the 'ort' strategy.
 .../devicetree/bindings/pwm/pwm-tipwmss.txt        | 58 ---------------
 .../devicetree/bindings/pwm/ti,am33xx-pwmss.yaml   | 82 ++++++++++++++++++++++
 Documentation/driver-api/pwm.rst                   |  2 +-
 drivers/pwm/pwm-brcmstb.c                          |  2 +-
 drivers/pwm/pwm-ipq.c                              |  2 +-
 drivers/pwm/pwm-iqs620a.c                          | 23 +-----
 drivers/pwm/pwm-loongson.c                         |  2 +
 drivers/pwm/pwm-pca9685.c                          |  2 +-
 drivers/pwm/pwm-renesas-tpu.c                      | 23 ++++--
 9 files changed, 109 insertions(+), 87 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-tipwmss.txt
 create mode 100644 Documentation/devicetree/bindings/pwm/ti,am33xx-pwmss.yaml
Merging ktest/for-next (932cdaf3e273a ktest: Add logfile to failure directory)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next
Already up to date.
Merging kselftest/next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
Already up to date.
Merging kunit/test (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'test' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test
Already up to date.
Merging kunit-next/kunit (e38f53f048246 kunit: Return void from kunit_run_all_tests())
$ git merge -m Merge branch 'kunit' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit
Merge made by the 'ort' strategy.
 include/kunit/test.h | 5 ++---
 lib/kunit/executor.c | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)
Merging livepatching/for-next (5d791d3396ca4 selftests/livepatch: filter debug messages in check_result())
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git livepatching/for-next
Merge made by the 'ort' strategy.
 include/linux/livepatch.h                      |  4 ++++
 kernel/livepatch/core.c                        | 10 ++++++++++
 tools/testing/selftests/livepatch/functions.sh | 12 +++++++++---
 3 files changed, 23 insertions(+), 3 deletions(-)
Merging rtc/rtc-next (afce9701d6423 MAINTAINERS: update rtc subsystem patchwork location)
$ git merge -m Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next
Already up to date.
Merging nvdimm/libnvdimm-for-next (e99cb3ecd8334 nvdimm-btt: clean up kernel-doc warnings)
$ git merge -m Merge branch 'libnvdimm-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next
Already up to date.
Merging at24/at24/for-next (dc59e4fea9d83 Linux 7.2-rc1)
$ git merge -m Merge branch 'at24/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next
Already up to date.
Merging ntb/ntb-next (dc59e4fea9d83 Linux 7.2-rc1)
$ 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 (41fa043273841 selftests/seccomp: Add hard-coded __NR_uprobe for x86_64)
$ git merge -m Merge branch 'for-next/seccomp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp
Already up to date.
Merging slimbus/for-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next
Already up to date.
Merging nvmem/for-next (8f596c13b6b7f dt-bindings: nvmem: qfprom: Add compatible for Qualcomm Maili)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next
Merge made by the 'ort' strategy.
 Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml | 1 +
 1 file changed, 1 insertion(+)
Merging hyperv/hyperv-next (be0cfab740e58 clocksource: hyper-v: Remove support for stimer interrupts in message mode)
$ git merge -m Merge branch 'hyperv-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next
Already up to date.
Merging auxdisplay/for-next (c868291c2b3d7 auxdisplay: arm-charlcd: Use DEFINE_SIMPLE_DEV_PM_OPS for power management)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next
Merge made by the 'ort' strategy.
 drivers/auxdisplay/arm-charlcd.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
Merging kgdb/kgdb/for-next (fdbdd0ccb30af kdb: remove redundant check for scancode 0xe0)
$ git merge -m Merge branch 'kgdb/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next
Already up to date.
Merging hmm/hmm (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'hmm' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm
Already up to date.
Merging cfi/cfi/next (dc59e4fea9d83 Linux 7.2-rc1)
$ git merge -m Merge branch 'cfi/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next
Already up to date.
Merging mhi/mhi-next (83c29a55b89e0 bus: mhi: host: pci_generic: Add IP_CTRL channel for Sierra EM919x/EM929x)
$ git merge -m Merge branch 'mhi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
Merge made by the 'ort' strategy.
 drivers/bus/mhi/host/pci_generic.c | 2 ++
 1 file changed, 2 insertions(+)
$ git am -3 ../patches/0001-fix-up-for-net-qrtr-Drop-the-MHI-auto_queue-feature-.patch
Applying: fix up for "net: qrtr: Drop the MHI auto_queue feature for IPCR DL channels"
Using index info to reconstruct a base tree...
M	drivers/net/wireless/ath/ath12k/wifi7/mhi.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Merging cxl/next (999811aca000b Merge branch 'for-7.4/cxl-fixes' into cxl-for-next)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
 .../driver-api/cxl/platform/acpi/dsdt.rst          |  3 +-
 MAINTAINERS                                        |  1 +
 drivers/cxl/core/core.h                            |  8 ++--
 drivers/cxl/core/edac.c                            | 30 ++++++++----
 drivers/cxl/core/features.c                        | 56 ++++++++++++++--------
 drivers/cxl/core/mce.c                             |  8 +++-
 drivers/cxl/core/ras.c                             |  6 +--
 drivers/cxl/core/region.c                          |  5 +-
 tools/testing/cxl/Kbuild                           | 16 ++++---
 tools/testing/cxl/test/cxl.c                       |  8 ++--
 10 files changed, 91 insertions(+), 50 deletions(-)
Merging zstd/zstd-next (65d1f5507ed2c zstd: Import upstream v1.5.7)
$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next
Already up to date.
Merging efi/next (2457ac9d44f3c efi/libstub: factor shared static GUID variables)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next
Merge made by the 'ort' strategy.
 drivers/firmware/efi/capsule.c                   |  4 +--
 drivers/firmware/efi/efi.c                       | 31 ++++++++++++++++++++++++
 drivers/firmware/efi/libstub/efi-stub-entry.c    |  2 +-
 drivers/firmware/efi/libstub/efi-stub-helper.c   | 10 ++++----
 drivers/firmware/efi/libstub/efi-stub.c          |  2 +-
 drivers/firmware/efi/libstub/file.c              |  8 +++---
 drivers/firmware/efi/libstub/gop.c               | 17 +++++++------
 drivers/firmware/efi/libstub/kaslr.c             |  2 +-
 drivers/firmware/efi/libstub/mem.c               |  2 +-
 drivers/firmware/efi/libstub/pci.c               |  2 +-
 drivers/firmware/efi/libstub/random.c            |  8 +++---
 drivers/firmware/efi/libstub/riscv.c             |  2 +-
 drivers/firmware/efi/libstub/smbios.c            |  3 ++-
 drivers/firmware/efi/libstub/tpm.c               |  8 +++---
 drivers/firmware/efi/libstub/unaccepted_memory.c |  2 +-
 drivers/firmware/efi/libstub/x86-stub.c          | 13 +++++-----
 drivers/firmware/efi/libstub/zboot.c             |  3 ++-
 drivers/firmware/efi/runtime-wrappers.c          | 28 +++++++++++++++++++++
 include/linux/efi.h                              |  1 +
 19 files changed, 107 insertions(+), 41 deletions(-)
Merging unicode/for-next (a511442085c14 unicode: Properly reject invalid encoding version strings)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next
Already up to date.
Merging random/master (26f5abb98a9cd virt: vmgenid: move to using dev_set/get_drvdata)
$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master
Merge made by the 'ort' strategy.
 drivers/virt/vmgenid.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
Merging landlock/next (e1e60f71f54f2 landlock: Clean up ruleset validation checks)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next
Merge made by the 'ort' strategy.
 security/landlock/domain.c                         |  3 +-
 security/landlock/fs.c                             | 18 +++--
 security/landlock/ruleset.c                        |  2 +-
 .../selftests/landlock/scoped_abstract_unix_test.c | 76 +++++++++++++++-------
 4 files changed, 69 insertions(+), 30 deletions(-)
Merging sysctl/sysctl-next (8d75c338f0bce sysctl: remove CONFIG_PROC_SYSCTL, it just mirrors CONFIG_SYSCTL)
$ git merge -m Merge branch 'sysctl-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next
Already up to date.
$ git am -3 ../patches/0001-jifies-Fix-up-merge.patch
Applying: jifies: Fix up merge
Using index info to reconstruct a base tree...
M	kernel/time/jiffies.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Merging execve/for-next/execve (ab11176bd3a76 x86/elf: Correct comment for STACK_RND_MASK())
$ git merge -m Merge branch 'for-next/execve' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve
Already up to date.
Merging bitmap/bitmap-for-next (cf72cbb39da84 Merge tag 'io_uring-7.3-20260828' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux)
$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next
Already up to date.
Merging hte/for-next (1329abe1bae41 hte: tegra194: Initialize slice locks before registering chip)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next
Merge made by the 'ort' strategy.
 drivers/hte/hte-tegra194.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
Merging kspp/for-next/kspp (7cada81883e82 Merge branch 'for-next/hardening' into for-next/kspp)
$ git merge -m Merge branch 'for-next/kspp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp
Merge made by the 'ort' strategy.
 drivers/misc/lkdtm/core.c                     | 16 +++----
 fs/signalfd.c                                 | 28 +++++++++---
 include/linux/fortify-string.h                |  2 -
 scripts/gcc-plugins/randomize_layout_plugin.c | 63 +++++++++++++++++++++++++--
 4 files changed, 89 insertions(+), 20 deletions(-)
Merging nolibc/for-next (6ef847683e7d2 tools/nolibc: validate directory with O_DIRECTORY in opendir())
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next
Merge made by the 'ort' strategy.
 tools/include/nolibc/Makefile                  |  19 ++-
 tools/include/nolibc/arch-hexagon.h            | 164 +++++++++++++++++++++++++
 tools/include/nolibc/arch.h                    |   2 +
 tools/include/nolibc/dirent.h                  |  18 ++-
 tools/include/nolibc/nolibc.h                  |   1 +
 tools/include/nolibc/sys/sendfile.h            |  41 +++++++
 tools/testing/selftests/nolibc/Makefile.nolibc |  10 +-
 tools/testing/selftests/nolibc/nolibc-test.c   |  70 +++++++++++
 tools/testing/selftests/nolibc/run-tests.sh    |  24 +++-
 9 files changed, 341 insertions(+), 8 deletions(-)
 create mode 100644 tools/include/nolibc/arch-hexagon.h
 create mode 100644 tools/include/nolibc/sys/sendfile.h
Merging iommufd/for-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next
Already up to date.
Merging turbostat/next (1c996a37fd244 tools/power turbostat: pmt: Improve sscanf() hygiene)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next
Merge made by the 'ort' strategy.
 tools/power/x86/turbostat/turbostat.8 |   6 +-
 tools/power/x86/turbostat/turbostat.c | 567 ++++++++++++++++------------------
 2 files changed, 266 insertions(+), 307 deletions(-)
Merging pwrseq/pwrseq/for-next (3b04e9b8056e8 power: sequencing: Add Renesas RZ/G3L Power Ready driver)
$ git merge -m Merge branch 'pwrseq/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next
Auto-merging drivers/power/sequencing/Kconfig
Merge made by the 'ort' strategy.
 drivers/power/sequencing/Kconfig                 |   9 ++
 drivers/power/sequencing/Makefile                |   1 +
 drivers/power/sequencing/pwrseq-renesas-pwrrdy.c | 142 +++++++++++++++++++++++
 3 files changed, 152 insertions(+)
 create mode 100644 drivers/power/sequencing/pwrseq-renesas-pwrrdy.c
Merging capabilities-next/caps-next (9b0ee13b80798 capability: remove non-kernel-doc comments)
$ git merge -m Merge branch 'caps-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next
Already up to date.
$ git am -3 ../patches/0001-sign-file-Fix-up-merge-issue.patch
Applying: sign-file: Fix up merge issue
Using index info to reconstruct a base tree...
M	scripts/sign-file.c
Falling back to patching base and 3-way merge...
Auto-merging scripts/sign-file.c
No changes -- Patch already applied.
Merging ipe/next (87c77c3cd372f ipe: fix invalid sgid value in audit event documentation)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next
Merge made by the 'ort' strategy.
 Documentation/admin-guide/LSM/ipe.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Merging kcsan/next (a8488ecbd7ba4 kcsan: avoid unintended access checking in NMIs)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next
Already up to date.
Merging crc/crc-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'crc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next
Already up to date.
Merging keys-next/keys-next (965e9a2cf23b0 pkcs7: Change a pr_warn() to pr_warn_once())
$ git merge -m Merge branch 'keys-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys-next/keys-next
Already up to date.
Merging fwctl/for-next (cee9395acd804 Linux 7.3-rc1)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl/for-next
Already up to date.
Merging devsec-tsm/next (3177779ae17db virt: coco: change tsm_class to a const struct)
$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm/next
Already up to date.
Merging hisilicon/for-next (a5db65458a911 Merge branch 'next/dt64' into for-next)
$ git merge -m Merge branch 'for-next' of https://github.com/hisilicon/linux-hisi.git hisilicon/for-next
Merge made by the 'ort' strategy.
Merging device-id/device-id-rework (995832b2cebe6 Replace <linux/mod_devicetable.h> by more specific <linux/device-id/*.h> (c files))
$ git merge -m Merge branch 'device-id-rework' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git device-id/device-id-rework
Already up to date.
Merging kthread/for-next (fa39ec4f89f26 doc: Add housekeeping documentation)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git kthread/for-next
Already up to date.
Merging pagemap-headers/headers (e02cb91d4644d ksm: Remove pagemap.h include)
$ git merge -m Merge branch 'headers' of git://git.infradead.org/users/willy/pagecache.git pagemap-headers/headers
Auto-merging arch/alpha/include/asm/pgtable.h
Auto-merging arch/arc/include/asm/pgtable-levels.h
Auto-merging arch/microblaze/include/asm/pgtable.h
Auto-merging arch/sparc/include/asm/pgtable_64.h
Auto-merging arch/x86/virt/vmx/tdx/tdx.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
Auto-merging drivers/gpu/drm/msm/msm_fb.c
Auto-merging drivers/gpu/drm/nouveau/nouveau_dmem.c
Auto-merging drivers/gpu/drm/panthor/panthor_gem.c
Auto-merging drivers/hwmon/pmbus/pmbus_core.c
Auto-merging drivers/i2c/busses/i2c-amd-asf-plat.c
Auto-merging drivers/i2c/busses/i2c-gxp.c
Auto-merging drivers/i2c/busses/i2c-k1.c
Auto-merging drivers/iio/accel/fxls8962af-core.c
Auto-merging drivers/iio/adc/ti-ads1298.c
Auto-merging drivers/iio/light/rohm-bu27034.c
Auto-merging drivers/iio/pressure/bmp280-core.c
Auto-merging drivers/mfd/88pm886.c
Auto-merging drivers/mfd/cs42l43.c
Auto-merging drivers/mmc/core/core.c
Auto-merging drivers/mmc/core/host.c
Auto-merging drivers/pinctrl/pinctrl-sx150x.c
Auto-merging drivers/regulator/fixed.c
Auto-merging drivers/regulator/tps65185.c
Auto-merging drivers/ufs/host/ufs-mediatek.c
Auto-merging drivers/ufs/host/ufs-qcom.c
Auto-merging drivers/usb/typec/mux/it5205.c
Auto-merging fs/aio.c
Auto-merging fs/buffer.c
Auto-merging fs/inode.c
Auto-merging fs/nfs/nfstrace.h
Auto-merging fs/nfs/pnfs.c
Auto-merging fs/nfsd/nfs4proc.c
Auto-merging include/linux/ceph/libceph.h
Auto-merging include/linux/i3c/master.h
Auto-merging include/linux/nfs_fs.h
Auto-merging include/linux/swap.h
Auto-merging kernel/power/snapshot.c
Auto-merging net/ceph/osd_client.c
CONFLICT (content): Merge conflict in net/ceph/osd_client.c
Auto-merging net/ceph/pagevec.c
Auto-merging net/sunrpc/auth_gss/gss_krb5_crypto.c
Auto-merging net/sunrpc/xdr.c
Auto-merging net/sunrpc/xprtsock.c
Auto-merging security/selinux/hooks.c
Auto-merging security/selinux/selinuxfs.c
Resolved 'net/ceph/osd_client.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 317c288c0c89d] Merge branch 'headers' of git://git.infradead.org/users/willy/pagecache.git
$ git diff -M --stat --summary HEAD^..
 arch/alpha/include/asm/pgtable.h                   |  2 +-
 arch/arc/include/asm/Kbuild                        |  1 +
 arch/arc/include/asm/pgtable-levels.h              |  2 ++
 arch/arc/include/asm/tlb.h                         | 12 ----------
 arch/arm/include/asm/pgalloc.h                     |  2 --
 arch/arm/include/asm/tlb.h                         |  2 --
 arch/arm/mach-pxa/pxa3xx.c                         |  1 +
 arch/arm64/include/asm/tlb.h                       |  3 ---
 arch/hexagon/include/asm/tlb.h                     |  1 -
 arch/microblaze/include/asm/pgtable.h              |  2 +-
 arch/nios2/include/asm/tlb.h                       |  1 -
 arch/openrisc/include/asm/Kbuild                   |  1 +
 arch/openrisc/include/asm/tlb.h                    | 26 ----------------------
 arch/powerpc/include/asm/tlb.h                     |  2 --
 arch/sh/include/asm/pgtable.h                      |  2 +-
 arch/sh/include/asm/tlb.h                          |  1 -
 arch/sparc/include/asm/pgtable_64.h                |  2 +-
 arch/sparc/include/asm/tlb_64.h                    |  1 -
 arch/x86/include/asm/pgalloc.h                     |  1 -
 arch/x86/virt/vmx/tdx/tdx.c                        |  1 +
 arch/xtensa/kernel/hibernate.c                     |  1 +
 block/fops.c                                       |  1 +
 drivers/char/agp/backend.c                         |  1 -
 drivers/char/agp/generic.c                         |  1 -
 drivers/char/agp/intel-agp.c                       |  1 -
 drivers/char/agp/intel-gtt.c                       |  1 -
 drivers/char/agp/uninorth-agp.c                    |  3 ++-
 drivers/dma/ste_dma40.c                            |  1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   |  1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |  1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |  1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |  3 +--
 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c           |  1 +
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h              |  1 -
 drivers/gpu/drm/display/drm_dp_cec.c               |  1 +
 drivers/gpu/drm/etnaviv/etnaviv_gpu.c              |  1 +
 drivers/gpu/drm/i915/display/intel_display_power.c |  1 +
 drivers/gpu/drm/i915/gem/i915_gem_userptr.c        |  1 +
 drivers/gpu/drm/msm/msm_fb.c                       |  2 ++
 drivers/gpu/drm/msm/msm_gem_shrinker.c             |  2 ++
 drivers/gpu/drm/nouveau/nouveau_dmem.c             |  1 +
 drivers/gpu/drm/omapdrm/dss/hdmi4.c                |  1 +
 drivers/gpu/drm/omapdrm/dss/hdmi5.c                |  1 +
 drivers/gpu/drm/panel/panel-ilitek-ili9806e-core.c |  1 +
 drivers/gpu/drm/panfrost/panfrost_gem.c            |  2 ++
 drivers/gpu/drm/panthor/panthor_gem.c              |  3 +++
 drivers/hwmon/pmbus/pmbus_core.c                   |  1 +
 drivers/i2c/busses/i2c-amd-asf-plat.c              |  1 +
 drivers/i2c/busses/i2c-gxp.c                       |  1 +
 drivers/i2c/busses/i2c-k1.c                        |  1 +
 drivers/i2c/busses/i2c-pasemi-platform.c           |  1 +
 drivers/iio/accel/fxls8962af-core.c                |  1 +
 drivers/iio/adc/nct7201.c                          |  1 +
 drivers/iio/adc/ti-ads1298.c                       |  1 +
 drivers/iio/light/rohm-bu27034.c                   |  1 +
 drivers/iio/pressure/bmp280-core.c                 |  1 +
 drivers/iio/pressure/bmp280.h                      |  1 +
 drivers/input/misc/aw86927.c                       |  1 +
 drivers/input/touchscreen/goodix_berlin_core.c     |  1 +
 drivers/input/touchscreen/hynitron_cstxxx.c        |  1 +
 drivers/input/touchscreen/imagis.c                 |  1 +
 drivers/leds/leds-turris-omnia.c                   |  1 +
 drivers/media/common/videobuf2/frame_vector.c      |  1 -
 drivers/media/pci/cx18/cx18-driver.h               |  1 -
 drivers/media/pci/ivtv/ivtv-driver.h               |  2 +-
 drivers/media/platform/st/stm32/stm32-csi.c        |  1 +
 drivers/media/platform/ti/omap3isp/ispvideo.c      |  1 -
 drivers/media/usb/go7007/go7007-v4l2.c             |  1 -
 drivers/media/usb/gspca/gspca.c                    |  1 -
 drivers/mfd/88pm886.c                              |  1 +
 drivers/mfd/abx500-core.c                          |  1 +
 drivers/mfd/adp5585.c                              |  1 +
 drivers/mfd/cs40l50-core.c                         |  1 +
 drivers/mfd/cs42l43.c                              |  1 +
 drivers/mfd/rt5120.c                               |  1 +
 drivers/mfd/tps65219.c                             |  1 +
 drivers/mfd/twl-core.c                             |  2 +-
 drivers/mmc/core/core.c                            |  1 -
 drivers/mmc/core/host.c                            |  1 -
 drivers/mmc/host/renesas_sdhi_internal_dmac.c      |  1 -
 drivers/mmc/host/renesas_sdhi_sys_dmac.c           |  1 -
 drivers/mmc/host/sh_mmcif.c                        |  1 -
 drivers/mmc/host/tmio_mmc.h                        |  1 -
 drivers/mmc/host/tmio_mmc_core.c                   |  1 -
 drivers/mmc/host/usdhi6rol0.c                      |  1 -
 drivers/net/ethernet/atheros/atl1c/atl1c.h         |  1 -
 drivers/net/ethernet/atheros/atl1e/atl1e.h         |  1 -
 drivers/net/ethernet/intel/e1000/e1000.h           |  1 -
 drivers/net/ethernet/intel/e1000e/netdev.c         |  1 -
 drivers/net/ethernet/intel/igb/igb_main.c          |  1 -
 drivers/net/ethernet/intel/igbvf/netdev.c          |  1 -
 drivers/phy/st/phy-stm32-combophy.c                |  1 +
 drivers/pinctrl/pinctrl-sx150x.c                   |  1 +
 drivers/platform/arm64/huawei-gaokun-ec.c          |  1 +
 drivers/platform/arm64/lenovo-yoga-c630.c          |  2 +-
 .../platform/x86/intel/int3472/clk_and_regulator.c |  1 +
 drivers/power/supply/bq25630_charger.c             |  1 +
 drivers/power/supply/rk817_charger.c               |  2 +-
 drivers/regulator/fixed.c                          |  1 +
 drivers/regulator/fp9931.c                         |  1 +
 drivers/regulator/mt6360-regulator.c               |  1 +
 drivers/regulator/qcom-labibb-regulator.c          |  1 +
 drivers/regulator/rtq2208-regulator.c              |  1 +
 drivers/regulator/tps65185.c                       |  1 +
 drivers/regulator/tps65219-regulator.c             |  1 +
 drivers/regulator/tps6594-regulator.c              |  1 +
 drivers/soc/xilinx/zynqmp_power.c                  |  1 +
 drivers/ufs/host/ufs-mediatek.c                    |  1 +
 drivers/ufs/host/ufs-qcom.c                        |  1 +
 drivers/usb/core/hcd.c                             |  1 +
 drivers/usb/typec/mux/it5205.c                     |  1 +
 drivers/usb/typec/wusb3801.c                       |  1 +
 drivers/video/fbdev/core/fb_procfs.c               |  1 +
 drivers/xen/balloon.c                              |  1 +
 fs/aio.c                                           |  1 +
 fs/buffer.c                                        |  1 +
 fs/file_table.c                                    |  1 +
 fs/inode.c                                         |  1 +
 fs/nfs/blocklayout/blocklayout.c                   |  1 +
 fs/nfs/nfs42proc.c                                 |  1 +
 fs/nfs/nfstrace.h                                  |  1 +
 fs/nfs/pnfs.c                                      |  1 +
 fs/nfsd/nfs4proc.c                                 |  1 +
 include/drm/drm_print.h                            |  1 +
 include/drm/ttm/ttm_tt.h                           |  1 -
 include/linux/balloon.h                            |  1 -
 include/linux/ceph/libceph.h                       |  1 -
 include/linux/i3c/master.h                         |  1 +
 include/linux/ksm.h                                |  1 -
 include/linux/mempolicy.h                          |  1 -
 include/linux/nfs_fs.h                             |  1 -
 include/linux/nfs_page.h                           |  1 -
 include/linux/suspend.h                            |  1 -
 include/linux/swap.h                               |  1 -
 include/sound/cs35l41.h                            |  1 +
 kernel/power/snapshot.c                            |  1 +
 net/ceph/osd_client.c                              |  1 -
 net/ceph/pagevec.c                                 |  1 +
 net/core/datagram.c                                |  1 -
 net/rds/rdma.c                                     |  1 -
 net/sunrpc/auth_gss/auth_gss.c                     |  1 -
 net/sunrpc/auth_gss/gss_krb5_crypto.c              |  1 -
 net/sunrpc/auth_gss/gss_krb5_wrap.c                |  1 -
 net/sunrpc/auth_gss/svcauth_gss.c                  |  1 -
 net/sunrpc/cache.c                                 |  1 -
 net/sunrpc/rpc_pipe.c                              |  1 -
 net/sunrpc/socklib.c                               |  1 -
 net/sunrpc/xdr.c                                   |  1 -
 net/sunrpc/xprtsock.c                              |  1 -
 security/commoncap.c                               |  3 ---
 security/inode.c                                   |  1 -
 security/selinux/hooks.c                           |  1 -
 security/selinux/selinuxfs.c                       |  1 -
 security/smack/smack_lsm.c                         |  1 -
 sound/soc/codecs/cs35l41-lib.c                     |  1 +
 155 files changed, 98 insertions(+), 118 deletions(-)
 delete mode 100644 arch/arc/include/asm/tlb.h
 delete mode 100644 arch/openrisc/include/asm/tlb.h