--- /dev/null
+$ date -R
+Mon, 06 Jan 2025 07:23:32 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+Updating files: 80% (4190/5197)\rUpdating files: 81% (4210/5197)\rUpdating files: 82% (4262/5197)\rUpdating files: 83% (4314/5197)\rUpdating files: 84% (4366/5197)\rUpdating files: 85% (4418/5197)\rUpdating files: 86% (4470/5197)\rUpdating files: 87% (4522/5197)\rUpdating files: 88% (4574/5197)\rUpdating files: 89% (4626/5197)\rUpdating files: 90% (4678/5197)\rUpdating files: 91% (4730/5197)\rUpdating files: 92% (4782/5197)\rUpdating files: 93% (4834/5197)\rUpdating files: 94% (4886/5197)\rUpdating files: 95% (4938/5197)\rUpdating files: 96% (4990/5197)\rUpdating files: 97% (5042/5197)\rUpdating files: 98% (5094/5197)\rUpdating files: 99% (5146/5197)\rUpdating files: 100% (5197/5197)\rUpdating files: 100% (5197/5197), done.
+HEAD is now at 8faabc041a00 Merge tag 'net-6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
+Merging origin/master (9244696b34f2 Merge tag 'kbuild-fixes-v6.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
+Updating 8faabc041a00..9244696b34f2
+Fast-forward (no commit created; -m option ignored)
+ .mailmap | 3 +-
+ .../admin-guide/laptops/thinkpad-acpi.rst | 10 +-
+ Documentation/admin-guide/mm/transhuge.rst | 2 +-
+ Documentation/admin-guide/pm/amd-pstate.rst | 4 +-
+ .../devicetree/bindings/crypto/fsl,sec-v4.0.yaml | 10 +-
+ .../bindings/display/bridge/adi,adv7533.yaml | 2 +-
+ .../bindings/mtd/partitions/fixed-partitions.yaml | 2 +-
+ .../bindings/soc/fsl/fsl,qman-portal.yaml | 2 +
+ .../devicetree/bindings/sound/realtek,rt5645.yaml | 2 +-
+ Documentation/mm/process_addrs.rst | 850 +++++++++++++++++++++
+ Documentation/netlink/specs/mptcp_pm.yaml | 60 +-
+ MAINTAINERS | 14 +-
+ Makefile | 2 +-
+ arch/arc/Kconfig | 1 +
+ arch/arc/include/asm/cachetype.h | 8 +
+ arch/arm/mach-imx/Kconfig | 1 +
+ arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 8 +-
+ arch/arm64/kernel/signal.c | 35 +-
+ arch/nios2/kernel/cpuinfo.c | 10 +-
+ arch/powerpc/configs/pmac32_defconfig | 1 +
+ arch/powerpc/configs/ppc6xx_defconfig | 1 +
+ arch/powerpc/platforms/book3s/vas-api.c | 36 +
+ arch/x86/events/intel/core.c | 12 +-
+ arch/x86/events/intel/ds.c | 1 +
+ arch/x86/events/intel/uncore.c | 1 +
+ arch/x86/include/asm/cpufeatures.h | 1 +
+ arch/x86/kernel/cet.c | 30 +
+ arch/x86/kvm/mmu/mmu.c | 12 -
+ arch/x86/kvm/mmu/spte.h | 17 +
+ arch/x86/kvm/mmu/tdp_mmu.c | 5 +
+ arch/x86/kvm/svm/avic.c | 6 +
+ arch/x86/kvm/svm/svm.c | 9 -
+ arch/x86/kvm/vmx/posted_intr.h | 2 +-
+ arch/x86/kvm/x86.c | 9 +-
+ block/bdev.c | 3 +-
+ block/blk-mq-sysfs.c | 16 +-
+ block/blk-mq.c | 40 +-
+ block/blk-sysfs.c | 4 +-
+ drivers/accel/ivpu/ivpu_gem.c | 2 +-
+ drivers/accel/ivpu/ivpu_mmu_context.c | 10 +-
+ drivers/accel/ivpu/ivpu_pm.c | 2 +-
+ drivers/acpi/Kconfig | 4 +-
+ drivers/auxdisplay/Kconfig | 2 +-
+ drivers/block/ublk_drv.c | 26 +-
+ drivers/block/zram/zram_drv.c | 15 +-
+ drivers/cdrom/cdrom.c | 2 +-
+ drivers/clk/imx/clk-imx8mp-audiomix.c | 3 +-
+ drivers/clk/thead/clk-th1520-ap.c | 13 +-
+ drivers/cpufreq/amd-pstate.c | 50 +-
+ drivers/dma-buf/dma-buf.c | 2 +-
+ drivers/dma-buf/udmabuf.c | 43 +-
+ drivers/dma/amd/qdma/qdma.c | 28 +-
+ drivers/dma/apple-admac.c | 7 +-
+ drivers/dma/at_xdmac.c | 2 +
+ drivers/dma/dw/acpi.c | 6 +-
+ drivers/dma/dw/internal.h | 8 +
+ drivers/dma/dw/pci.c | 4 +-
+ drivers/dma/fsl-edma-common.h | 1 +
+ drivers/dma/fsl-edma-main.c | 41 +-
+ drivers/dma/loongson2-apb-dma.c | 2 +-
+ drivers/dma/mv_xor.c | 2 +
+ drivers/dma/tegra186-gpc-dma.c | 10 +
+ drivers/firmware/microchip/mpfs-auto-update.c | 4 +-
+ drivers/gpu/drm/Kconfig | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 11 +
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 2 +-
+ .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 2 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 14 +-
+ drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 10 +-
+ drivers/gpu/drm/bridge/adv7511/adv7533.c | 4 +-
+ drivers/gpu/drm/display/drm_dp_tunnel.c | 10 +-
+ drivers/gpu/drm/drm_modes.c | 11 +-
+ drivers/gpu/drm/i915/display/intel_cx0_phy.c | 12 +-
+ drivers/gpu/drm/i915/gt/intel_engine_types.h | 5 +
+ drivers/gpu/drm/i915/gt/intel_rc6.c | 2 +-
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 41 +-
+ drivers/gpu/drm/panel/panel-himax-hx83102.c | 2 +
+ drivers/gpu/drm/panel/panel-novatek-nt35950.c | 4 +-
+ drivers/gpu/drm/panel/panel-sitronix-st7701.c | 1 +
+ drivers/gpu/drm/panel/panel-synaptics-r63353.c | 2 +-
+ drivers/gpu/drm/scheduler/sched_main.c | 3 +-
+ drivers/gpu/drm/xe/xe_bo.c | 12 +-
+ drivers/gpu/drm/xe/xe_devcoredump.c | 15 +-
+ drivers/gpu/drm/xe/xe_exec_queue.c | 9 +
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 2 +-
+ drivers/gpu/drm/xe/xe_oa.c | 134 ++--
+ drivers/gpu/drm/xe/xe_ring_ops.c | 5 +-
+ drivers/gpu/drm/xe/xe_sched_job_types.h | 2 +
+ drivers/hwmon/tmp513.c | 10 +-
+ drivers/i2c/busses/i2c-imx.c | 9 +-
+ drivers/i2c/busses/i2c-microchip-corei2c.c | 126 ++-
+ drivers/infiniband/core/cma.c | 16 +
+ drivers/infiniband/core/nldev.c | 2 +-
+ drivers/infiniband/core/uverbs_cmd.c | 16 +-
+ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 50 +-
+ drivers/infiniband/hw/bnxt_re/ib_verbs.h | 4 +
+ drivers/infiniband/hw/bnxt_re/main.c | 8 +-
+ drivers/infiniband/hw/bnxt_re/qplib_fp.c | 79 +-
+ drivers/infiniband/hw/bnxt_re/qplib_fp.h | 4 +-
+ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 5 +-
+ drivers/infiniband/hw/bnxt_re/qplib_res.h | 5 +
+ drivers/infiniband/hw/bnxt_re/qplib_sp.c | 18 +-
+ drivers/infiniband/hw/bnxt_re/roce_hsi.h | 1 +
+ drivers/infiniband/hw/hns/hns_roce_hem.c | 43 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 11 +-
+ drivers/infiniband/hw/hns/hns_roce_mr.c | 5 -
+ drivers/infiniband/hw/mlx5/main.c | 8 +-
+ drivers/infiniband/sw/rxe/rxe.c | 23 +-
+ drivers/infiniband/sw/rxe/rxe.h | 3 +-
+ drivers/infiniband/sw/rxe/rxe_mcast.c | 22 +-
+ drivers/infiniband/sw/rxe/rxe_net.c | 24 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 26 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.h | 11 +-
+ drivers/infiniband/sw/siw/siw.h | 7 +-
+ drivers/infiniband/sw/siw/siw_cm.c | 27 +-
+ drivers/infiniband/sw/siw/siw_main.c | 15 +-
+ drivers/infiniband/sw/siw/siw_verbs.c | 35 +-
+ drivers/infiniband/ulp/rtrs/rtrs-srv.c | 2 +-
+ drivers/macintosh/Kconfig | 1 +
+ drivers/media/dvb-frontends/dib3000mb.c | 2 +-
+ .../vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 3 +-
+ drivers/mmc/host/sdhci-msm.c | 16 +-
+ drivers/mtd/nand/raw/arasan-nand-controller.c | 11 +-
+ drivers/mtd/nand/raw/atmel/pmecc.c | 4 +-
+ drivers/mtd/nand/raw/diskonchip.c | 2 +-
+ drivers/mtd/nand/raw/omap2.c | 16 +
+ drivers/net/dsa/microchip/ksz9477.c | 47 +-
+ drivers/net/dsa/microchip/ksz9477_reg.h | 4 +-
+ drivers/net/dsa/microchip/lan937x_main.c | 62 +-
+ drivers/net/dsa/microchip/lan937x_reg.h | 9 +-
+ drivers/net/ethernet/broadcom/bcmsysport.c | 21 +-
+ drivers/net/ethernet/google/gve/gve.h | 1 +
+ drivers/net/ethernet/google/gve/gve_main.c | 63 +-
+ drivers/net/ethernet/google/gve/gve_tx.c | 46 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 14 +-
+ drivers/net/ethernet/marvell/sky2.c | 1 +
+ .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 4 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 19 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 15 +
+ .../net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 3 +
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 5 +-
+ .../mellanox/mlx5/core/steering/sws/dr_send.c | 4 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 3 +-
+ drivers/net/ethernet/meta/fbnic/fbnic_csr.c | 2 +-
+ drivers/net/ethernet/sfc/tc_conntrack.c | 2 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 43 +-
+ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +-
+ drivers/net/ethernet/ti/icssg/icss_iep.c | 8 +
+ drivers/net/ethernet/ti/icssg/icssg_common.c | 25 -
+ drivers/net/ethernet/ti/icssg/icssg_config.c | 41 +-
+ drivers/net/ethernet/ti/icssg/icssg_config.h | 1 +
+ drivers/net/ethernet/ti/icssg/icssg_prueth.c | 281 ++++---
+ drivers/net/ethernet/ti/icssg/icssg_prueth.h | 5 +-
+ drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c | 24 +-
+ drivers/net/phy/micrel.c | 114 ++-
+ drivers/net/pse-pd/tps23881.c | 16 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 1 +
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 1 +
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 14 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 41 +-
+ drivers/net/wireless/st/cw1200/cw1200_spi.c | 2 +-
+ drivers/net/wwan/iosm/iosm_ipc_mmio.c | 2 +-
+ drivers/net/wwan/t7xx/t7xx_state_monitor.c | 26 +-
+ drivers/net/wwan/t7xx/t7xx_state_monitor.h | 5 +-
+ drivers/nvme/host/core.c | 2 +-
+ drivers/nvme/host/nvme.h | 5 +
+ drivers/nvme/host/pci.c | 9 +-
+ drivers/nvme/host/tcp.c | 18 +-
+ drivers/nvme/target/admin-cmd.c | 9 +-
+ drivers/nvme/target/configfs.c | 23 +-
+ drivers/nvme/target/core.c | 108 +--
+ drivers/nvme/target/io-cmd-bdev.c | 2 +-
+ drivers/nvme/target/nvmet.h | 7 +
+ drivers/nvme/target/pr.c | 8 +-
+ drivers/of/address.c | 5 +-
+ drivers/of/base.c | 18 +-
+ drivers/of/empty_root.dts | 9 +-
+ drivers/of/irq.c | 2 +
+ drivers/of/property.c | 2 -
+ drivers/of/unittest-data/tests-address.dtsi | 2 +
+ drivers/of/unittest.c | 39 +
+ drivers/pci/msi/irqdomain.c | 7 +-
+ drivers/pci/msi/msi.c | 4 +
+ drivers/pci/pci.c | 6 +-
+ drivers/pci/pcie/portdrv.c | 4 +-
+ drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 6 +
+ drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 3 +-
+ drivers/phy/mediatek/Kconfig | 1 +
+ drivers/phy/phy-core.c | 21 +-
+ drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 2 +-
+ drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 2 +-
+ drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 3 +-
+ drivers/phy/st/phy-stm32-combophy.c | 21 +-
+ drivers/pinctrl/pinctrl-mcp23s08.c | 6 +
+ drivers/platform/chrome/cros_ec_lpc.c | 4 +-
+ drivers/platform/loongarch/Kconfig | 2 +-
+ drivers/platform/x86/hp/hp-wmi.c | 4 +-
+ drivers/platform/x86/mlx-platform.c | 2 +
+ drivers/platform/x86/thinkpad_acpi.c | 4 +-
+ drivers/pmdomain/core.c | 6 +
+ drivers/pmdomain/imx/gpcv2.c | 4 +-
+ drivers/power/supply/bq24190_charger.c | 12 +-
+ drivers/power/supply/cros_charge-control.c | 36 +-
+ drivers/power/supply/gpio-charger.c | 8 +
+ drivers/regulator/of_regulator.c | 2 +-
+ drivers/spi/spi-rockchip-sfc.c | 4 +-
+ drivers/staging/fbtft/Kconfig | 1 +
+ drivers/staging/gpib/common/Makefile | 2 +-
+ drivers/staging/gpib/nec7210/Makefile | 2 +-
+ drivers/thermal/thermal_thresholds.c | 76 +-
+ drivers/thunderbolt/nhi.c | 8 +
+ drivers/thunderbolt/nhi.h | 4 +
+ drivers/thunderbolt/retimer.c | 19 +-
+ drivers/thunderbolt/tb.c | 41 +
+ drivers/usb/host/xhci-mem.c | 2 +-
+ drivers/usb/host/xhci-ring.c | 2 -
+ drivers/usb/serial/option.c | 27 +
+ drivers/video/fbdev/Kconfig | 18 +-
+ drivers/video/fbdev/core/Kconfig | 3 +-
+ drivers/virt/coco/tdx-guest/tdx-guest.c | 4 +-
+ drivers/watchdog/stm32_iwdg.c | 2 +-
+ fs/btrfs/ctree.c | 11 +-
+ fs/btrfs/inode.c | 154 ++--
+ fs/btrfs/qgroup.c | 3 +-
+ fs/btrfs/relocation.c | 6 +
+ fs/btrfs/send.c | 6 +
+ fs/btrfs/sysfs.c | 6 +-
+ fs/ceph/file.c | 77 +-
+ fs/ceph/mds_client.c | 9 +-
+ fs/ceph/super.c | 2 +
+ fs/hugetlbfs/inode.c | 2 +-
+ fs/nfs/pnfs.c | 2 +-
+ fs/nfs/super.c | 1 +
+ fs/nfsd/export.c | 31 +-
+ fs/nfsd/export.h | 4 +-
+ fs/nfsd/nfs4callback.c | 4 +-
+ fs/nfsd/nfs4proc.c | 13 +-
+ fs/nilfs2/btnode.c | 1 +
+ fs/nilfs2/gcinode.c | 2 +-
+ fs/nilfs2/inode.c | 13 +-
+ fs/nilfs2/namei.c | 5 +
+ fs/nilfs2/nilfs.h | 1 +
+ fs/ocfs2/localalloc.c | 27 +-
+ fs/ocfs2/quota_global.c | 2 +-
+ fs/ocfs2/quota_local.c | 1 +
+ fs/proc/task_mmu.c | 2 +-
+ fs/smb/client/Kconfig | 1 -
+ fs/smb/client/cifsfs.c | 2 +-
+ fs/smb/client/cifsproto.h | 2 -
+ fs/smb/client/connect.c | 36 +-
+ fs/smb/client/file.c | 6 +-
+ fs/smb/client/sess.c | 25 -
+ fs/smb/client/smb2pdu.c | 5 +-
+ include/linux/alloc_tag.h | 9 +-
+ include/linux/cacheinfo.h | 6 +
+ include/linux/dmaengine.h | 13 +-
+ include/linux/highmem.h | 8 +-
+ include/linux/if_vlan.h | 16 +-
+ include/linux/io_uring.h | 4 +-
+ include/linux/io_uring_types.h | 2 +-
+ include/linux/memfd.h | 14 +
+ include/linux/mlx5/driver.h | 7 +
+ include/linux/mlx5/mlx5_ifc.h | 4 +-
+ include/linux/mm.h | 88 ++-
+ include/linux/mm_types.h | 30 +
+ include/linux/page-flags.h | 12 +-
+ include/linux/percpu-defs.h | 5 +-
+ include/linux/platform_data/amd_qdma.h | 2 +
+ include/linux/sched.h | 3 +-
+ include/linux/skmsg.h | 11 +-
+ include/linux/trace_events.h | 2 +-
+ include/linux/vermagic.h | 6 +-
+ include/linux/vmstat.h | 2 +-
+ include/net/netfilter/nf_tables.h | 7 +-
+ include/net/sock.h | 10 +-
+ include/uapi/linux/mptcp_pm.h | 50 +-
+ include/uapi/linux/stddef.h | 13 +-
+ include/uapi/linux/thermal.h | 4 +-
+ io_uring/io_uring.c | 17 +-
+ io_uring/kbuf.c | 4 +-
+ io_uring/net.c | 1 +
+ io_uring/register.c | 3 +
+ io_uring/rw.c | 2 +
+ io_uring/sqpoll.c | 6 +
+ io_uring/timeout.c | 85 ++-
+ kernel/bpf/verifier.c | 6 +-
+ kernel/fork.c | 13 +-
+ kernel/kcov.c | 2 +-
+ kernel/locking/rtmutex.c | 18 +-
+ kernel/locking/rtmutex_api.c | 2 +-
+ kernel/sched/ext.c | 4 +-
+ kernel/trace/fgraph.c | 2 +-
+ kernel/trace/ftrace.c | 8 +-
+ kernel/trace/ring_buffer.c | 6 +-
+ kernel/trace/trace.c | 12 +
+ kernel/trace/trace_events.c | 12 +
+ kernel/trace/trace_kprobe.c | 2 +-
+ kernel/workqueue.c | 23 +-
+ lib/alloc_tag.c | 41 +-
+ lib/maple_tree.c | 1 +
+ mm/damon/core.c | 10 +-
+ mm/filemap.c | 9 -
+ mm/huge_memory.c | 19 +-
+ mm/hugetlb.c | 21 +-
+ mm/internal.h | 12 +-
+ mm/khugepaged.c | 3 +
+ mm/kmemleak.c | 2 +-
+ mm/list_lru.c | 2 +-
+ mm/memfd.c | 2 +-
+ mm/memory.c | 18 +-
+ mm/mmap.c | 6 +-
+ mm/page_alloc.c | 6 +-
+ mm/pgtable-generic.c | 2 +-
+ mm/readahead.c | 6 +-
+ mm/shmem.c | 29 +-
+ mm/util.c | 7 +-
+ mm/vma.c | 5 +-
+ mm/vmalloc.c | 6 +-
+ mm/vmscan.c | 9 +-
+ mm/vmstat.c | 3 +-
+ mm/zswap.c | 19 +-
+ net/ceph/osd_client.c | 2 +
+ net/core/dev.c | 4 +-
+ net/core/filter.c | 21 +-
+ net/core/netdev-genl.c | 6 +-
+ net/core/skmsg.c | 11 +-
+ net/core/sock.c | 5 +-
+ net/ipv4/ip_tunnel.c | 6 +-
+ net/ipv4/tcp_bpf.c | 14 +-
+ net/ipv4/tcp_input.c | 1 +
+ net/ipv6/ila/ila_xlat.c | 16 +-
+ net/llc/llc_input.c | 2 +-
+ net/mptcp/options.c | 7 +
+ net/mptcp/protocol.c | 23 +-
+ net/netrom/nr_route.c | 6 +
+ net/packet/af_packet.c | 28 +-
+ net/sctp/associola.c | 3 +-
+ rust/kernel/workqueue.rs | 18 +-
+ scripts/mksysmap | 4 +-
+ scripts/mod/file2alias.c | 36 +-
+ scripts/mod/modpost.c | 41 +-
+ scripts/mod/modpost.h | 17 +-
+ scripts/package/PKGBUILD | 2 +-
+ scripts/package/builddeb | 6 +
+ scripts/package/mkdebian | 7 +
+ scripts/sorttable.h | 5 +-
+ sound/core/compress_offload.c | 43 +-
+ sound/core/memalloc.c | 2 +-
+ sound/core/seq/oss/seq_oss_synth.c | 2 +
+ sound/core/seq/seq_clientmgr.c | 14 +-
+ sound/core/ump.c | 2 +-
+ sound/pci/hda/patch_realtek.c | 1 +
+ sound/pci/hda/tas2781_hda_i2c.c | 4 +
+ sound/sh/sh_dac_audio.c | 2 +-
+ sound/soc/amd/ps/pci-ps.c | 17 +-
+ sound/soc/codecs/rt722-sdca.c | 7 +-
+ sound/soc/intel/boards/sof_sdw.c | 23 +-
+ .../soc/mediatek/common/mtk-afe-platform-driver.c | 4 +-
+ sound/soc/sof/intel/hda-dai.c | 25 +-
+ sound/soc/sof/intel/hda.h | 2 -
+ sound/usb/mixer_us16x08.c | 2 +-
+ tools/include/uapi/linux/stddef.h | 15 +-
+ tools/objtool/noreturns.h | 1 +
+ tools/sched_ext/include/scx/common.bpf.h | 6 +-
+ tools/sched_ext/scx_central.c | 2 +-
+ tools/testing/selftests/alsa/Makefile | 2 +-
+ .../selftests/bpf/prog_tests/socket_helpers.h | 394 ++++++++++
+ .../selftests/bpf/prog_tests/sockmap_basic.c | 51 ++
+ .../selftests/bpf/prog_tests/sockmap_helpers.h | 385 +---------
+ .../selftests/bpf/prog_tests/tc_change_tail.c | 62 ++
+ .../selftests/bpf/progs/test_sockmap_change_tail.c | 40 +
+ .../selftests/bpf/progs/test_tc_change_tail.c | 106 +++
+ tools/testing/selftests/bpf/sdt.h | 2 +
+ tools/testing/selftests/bpf/trace_helpers.c | 4 +
+ tools/testing/selftests/drivers/net/queues.py | 28 +-
+ tools/testing/selftests/memfd/memfd_test.c | 57 +-
+ .../selftests/net/forwarding/local_termination.sh | 1 -
+ .../selftests/sched_ext/ddsp_bogus_dsq_fail.bpf.c | 2 +-
+ .../selftests/sched_ext/ddsp_vtimelocal_fail.bpf.c | 4 +-
+ .../testing/selftests/sched_ext/dsp_local_on.bpf.c | 7 +-
+ tools/testing/selftests/sched_ext/dsp_local_on.c | 5 +-
+ .../selftests/sched_ext/enq_select_cpu_fails.bpf.c | 2 +-
+ tools/testing/selftests/sched_ext/exit.bpf.c | 4 +-
+ tools/testing/selftests/sched_ext/maximal.bpf.c | 8 +-
+ .../selftests/sched_ext/select_cpu_dfl.bpf.c | 2 +-
+ .../sched_ext/select_cpu_dfl_nodispatch.bpf.c | 2 +-
+ .../selftests/sched_ext/select_cpu_dispatch.bpf.c | 2 +-
+ .../sched_ext/select_cpu_dispatch_bad_dsq.bpf.c | 2 +-
+ .../sched_ext/select_cpu_dispatch_dbl_dsp.bpf.c | 4 +-
+ .../selftests/sched_ext/select_cpu_vtime.bpf.c | 8 +-
+ tools/tracing/rtla/src/timerlat_hist.c | 177 +++--
+ usr/include/Makefile | 2 +-
+ usr/include/headers_check.pl | 9 +-
+ 401 files changed, 5090 insertions(+), 2173 deletions(-)
+ create mode 100644 arch/arc/include/asm/cachetype.h
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/socket_helpers.h
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/tc_change_tail.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_change_tail.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_tc_change_tail.c
+Merging fixes/fixes (fac04efc5c79 Linux 6.13-rc2)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes
+Already up to date.
+Merging ext4-fixes/fixes (4bbf9020becb Linux 6.13-rc4)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes
+Already up to date.
+Merging vfs-brauner-fixes/vfs.fixes (03f275adb8fb fuse: respect FOPEN_KEEP_CACHE on opendir)
+$ git merge -m Merge branch 'vfs.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes
+Auto-merging fs/smb/client/smb2pdu.c
+CONFLICT (content): Merge conflict in fs/smb/client/smb2pdu.c
+Recorded preimage for 'fs/smb/client/smb2pdu.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'fs/smb/client/smb2pdu.c'.
+[fs-current 44f5f91f4e0e] Merge branch 'vfs.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
+$ git diff -M --stat --summary HEAD^..
+ fs/9p/vfs_addr.c | 6 ++++-
+ fs/afs/write.c | 5 +++-
+ fs/cachefiles/daemon.c | 14 +++++-----
+ fs/cachefiles/internal.h | 3 ++-
+ fs/cachefiles/security.c | 6 ++---
+ fs/file.c | 1 +
+ fs/fuse/dir.c | 2 ++
+ fs/hfs/super.c | 4 ++-
+ fs/iomap/buffered-io.c | 66 +++++++++++++++++++++++++++++++++++++++++-------
+ fs/jbd2/commit.c | 4 +--
+ fs/jbd2/revoke.c | 2 +-
+ fs/namespace.c | 10 ++++++--
+ fs/netfs/buffered_read.c | 28 +++++++++++---------
+ fs/netfs/direct_write.c | 1 -
+ fs/netfs/read_collect.c | 33 ++++++++++++++----------
+ fs/netfs/read_pgpriv2.c | 4 +++
+ fs/netfs/read_retry.c | 8 +++---
+ fs/netfs/write_collect.c | 14 ++++------
+ fs/netfs/write_issue.c | 2 ++
+ fs/nfs/fscache.c | 9 ++++++-
+ fs/notify/fdinfo.c | 4 +--
+ fs/overlayfs/copy_up.c | 5 ++--
+ fs/qnx6/inode.c | 11 +++-----
+ fs/smb/client/cifssmb.c | 13 +++++++---
+ fs/smb/client/smb2pdu.c | 9 ++++---
+ include/linux/iomap.h | 2 +-
+ include/linux/netfs.h | 7 +++--
+ kernel/gen_kheaders.sh | 1 +
+ 28 files changed, 181 insertions(+), 93 deletions(-)
+Merging fscrypt-current/for-current (8e929cb546ee Linux 6.12-rc3)
+$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current
+Already up to date.
+Merging fsverity-current/for-current (8e929cb546ee Linux 6.12-rc3)
+$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current
+Already up to date.
+Merging btrfs-fixes/next-fixes (d969d10fa064 Merge branch 'misc-6.13' into next-fixes)
+$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes
+Merge made by the 'ort' strategy.
+Merging vfs-fixes/fixes (678379e1d4f7 close_range(): fix the logics in descriptor table trimming)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes
+Already up to date.
+Merging erofs-fixes/fixes (6422cde1b0d5 erofs: use buffered I/O for file-backed mounts by default)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes
+Already up to date.
+Merging nfsd-fixes/nfsd-fixes (7917f01a286c nfsd: restore callback functionality for NFSv4.0)
+$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes
+Already up to date.
+Merging v9fs-fixes/fixes/next (684a64bf32b6 Merge tag 'nfs-for-6.12-1' of git://git.linux-nfs.org/projects/anna/linux-nfs)
+$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next
+Already up to date.
+Merging overlayfs-fixes/ovl-fixes (228a1157fb9f Merge tag '6.13-rc-part1-SMB3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6)
+$ git merge -m Merge branch 'ovl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes
+Already up to date.
+Merging bcachefs/for-next (432522786827 bcachefs: check_unreachable_inodes is not actually PASS_ONLINE yet)
+$ git merge -m Merge branch 'for-next' of git://evilpiepirate.org/bcachefs.git bcachefs/for-next
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/bcachefs/CodingStyle.rst | 2 +-
+ fs/bcachefs/Kconfig | 2 +-
+ fs/bcachefs/Makefile | 1 +
+ fs/bcachefs/acl.c | 11 +-
+ fs/bcachefs/alloc_background.c | 558 +++++++-------
+ fs/bcachefs/alloc_background.h | 18 +-
+ fs/bcachefs/alloc_background_format.h | 4 +-
+ fs/bcachefs/alloc_foreground.c | 304 +++-----
+ fs/bcachefs/alloc_foreground.h | 4 +-
+ fs/bcachefs/backpointers.c | 840 +++++++++++++--------
+ fs/bcachefs/backpointers.h | 97 ++-
+ fs/bcachefs/bbpos.h | 2 +-
+ fs/bcachefs/bcachefs.h | 70 +-
+ fs/bcachefs/bcachefs_format.h | 105 ++-
+ fs/bcachefs/bkey.h | 7 -
+ fs/bcachefs/bkey_methods.c | 29 +-
+ fs/bcachefs/bkey_methods.h | 15 +-
+ fs/bcachefs/bkey_types.h | 28 +
+ fs/bcachefs/btree_cache.c | 59 +-
+ fs/bcachefs/btree_cache.h | 14 +-
+ fs/bcachefs/btree_gc.c | 178 ++---
+ fs/bcachefs/btree_gc.h | 4 +-
+ fs/bcachefs/btree_io.c | 217 ++++--
+ fs/bcachefs/btree_io.h | 6 +-
+ fs/bcachefs/btree_iter.c | 608 +++++++++------
+ fs/bcachefs/btree_iter.h | 134 ++--
+ fs/bcachefs/btree_journal_iter.c | 237 +++++-
+ fs/bcachefs/btree_journal_iter.h | 22 +-
+ fs/bcachefs/btree_journal_iter_types.h | 36 +
+ fs/bcachefs/btree_key_cache.c | 75 +-
+ fs/bcachefs/btree_locking.c | 16 +-
+ fs/bcachefs/btree_locking.h | 50 +-
+ fs/bcachefs/btree_node_scan.c | 153 ++--
+ fs/bcachefs/btree_node_scan_types.h | 1 -
+ fs/bcachefs/btree_trans_commit.c | 213 ++----
+ fs/bcachefs/btree_types.h | 62 +-
+ fs/bcachefs/btree_update.c | 74 +-
+ fs/bcachefs/btree_update.h | 29 +-
+ fs/bcachefs/btree_update_interior.c | 295 ++++----
+ fs/bcachefs/btree_update_interior.h | 3 +-
+ fs/bcachefs/btree_write_buffer.c | 83 +-
+ fs/bcachefs/buckets.c | 133 ++--
+ fs/bcachefs/buckets.h | 30 +-
+ fs/bcachefs/buckets_types.h | 2 +-
+ fs/bcachefs/chardev.c | 219 +-----
+ fs/bcachefs/checksum.c | 10 +-
+ fs/bcachefs/checksum.h | 2 +-
+ fs/bcachefs/compress.c | 96 ++-
+ fs/bcachefs/darray.h | 2 +-
+ fs/bcachefs/data_update.c | 76 +-
+ fs/bcachefs/debug.c | 4 +-
+ fs/bcachefs/dirent.c | 10 +-
+ fs/bcachefs/dirent.h | 4 +-
+ fs/bcachefs/disk_accounting.c | 150 ++--
+ fs/bcachefs/disk_accounting.h | 73 +-
+ fs/bcachefs/ec.c | 275 +++----
+ fs/bcachefs/ec.h | 5 +-
+ fs/bcachefs/errcode.h | 21 +-
+ fs/bcachefs/error.c | 187 +++--
+ fs/bcachefs/error.h | 58 +-
+ fs/bcachefs/extent_update.c | 4 +-
+ fs/bcachefs/extents.c | 290 +++----
+ fs/bcachefs/extents.h | 18 +-
+ fs/bcachefs/extents_format.h | 15 +-
+ fs/bcachefs/fs-common.c | 108 ++-
+ fs/bcachefs/fs-common.h | 2 +
+ fs/bcachefs/fs-io-buffered.c | 45 +-
+ fs/bcachefs/fs-io-direct.c | 5 +
+ fs/bcachefs/fs-io-pagecache.c | 4 +-
+ fs/bcachefs/fs-io.c | 54 +-
+ fs/bcachefs/fs-ioctl.c | 7 +-
+ fs/bcachefs/fs.c | 88 ++-
+ fs/bcachefs/fs.h | 1 +
+ fs/bcachefs/fsck.c | 733 +++++++++++-------
+ fs/bcachefs/fsck.h | 11 +
+ fs/bcachefs/inode.c | 169 +++--
+ fs/bcachefs/inode.h | 43 +-
+ fs/bcachefs/inode_format.h | 15 +-
+ fs/bcachefs/io_misc.c | 22 +-
+ fs/bcachefs/io_read.c | 246 +++---
+ fs/bcachefs/io_read.h | 28 +-
+ fs/bcachefs/io_write.c | 102 +--
+ fs/bcachefs/journal.c | 162 ++--
+ fs/bcachefs/journal.h | 9 +-
+ fs/bcachefs/journal_io.c | 231 +++---
+ fs/bcachefs/journal_io.h | 2 +-
+ fs/bcachefs/journal_reclaim.c | 19 +-
+ fs/bcachefs/journal_types.h | 5 +
+ fs/bcachefs/logged_ops.c | 11 +-
+ fs/bcachefs/logged_ops_format.h | 5 +
+ fs/bcachefs/lru.c | 4 +-
+ fs/bcachefs/lru.h | 2 +-
+ fs/bcachefs/move.c | 184 +++--
+ fs/bcachefs/move.h | 5 +-
+ fs/bcachefs/movinggc.c | 6 +-
+ fs/bcachefs/opts.c | 26 +-
+ fs/bcachefs/opts.h | 61 +-
+ fs/bcachefs/printbuf.h | 15 +-
+ fs/bcachefs/quota.c | 2 +-
+ fs/bcachefs/quota.h | 4 +-
+ fs/bcachefs/rcu_pending.c | 38 +-
+ fs/bcachefs/rebalance.c | 266 ++++++-
+ fs/bcachefs/rebalance.h | 10 +
+ fs/bcachefs/rebalance_format.h | 53 ++
+ fs/bcachefs/rebalance_types.h | 2 -
+ fs/bcachefs/recovery.c | 218 ++++--
+ fs/bcachefs/recovery.h | 2 +-
+ fs/bcachefs/recovery_passes.c | 108 ++-
+ fs/bcachefs/recovery_passes.h | 1 +
+ fs/bcachefs/recovery_passes_types.h | 92 +--
+ fs/bcachefs/reflink.c | 498 +++++++++---
+ fs/bcachefs/reflink.h | 20 +-
+ fs/bcachefs/reflink_format.h | 7 +-
+ fs/bcachefs/sb-clean.c | 6 +-
+ fs/bcachefs/sb-counters_format.h | 165 ++--
+ fs/bcachefs/sb-downgrade.c | 25 +-
+ fs/bcachefs/sb-errors_format.h | 53 +-
+ fs/bcachefs/six.c | 17 +-
+ fs/bcachefs/six.h | 1 +
+ fs/bcachefs/snapshot.c | 529 ++++++-------
+ fs/bcachefs/snapshot.h | 17 +-
+ fs/bcachefs/str_hash.c | 286 +++++++
+ fs/bcachefs/str_hash.h | 28 +-
+ fs/bcachefs/subvolume.c | 68 +-
+ fs/bcachefs/subvolume.h | 19 +-
+ fs/bcachefs/subvolume_types.h | 2 +-
+ fs/bcachefs/super-io.c | 83 +-
+ fs/bcachefs/super-io.h | 21 +-
+ fs/bcachefs/super.c | 54 +-
+ fs/bcachefs/super.h | 10 -
+ fs/bcachefs/sysfs.c | 60 +-
+ fs/bcachefs/tests.c | 26 +-
+ fs/bcachefs/trace.h | 77 +-
+ fs/bcachefs/util.h | 32 +
+ fs/bcachefs/varint.c | 5 +-
+ fs/bcachefs/xattr.c | 13 +-
+ fs/bcachefs/xattr.h | 5 +-
+ fs/fs_parser.c | 3 +-
+ include/linux/fs_parser.h | 2 +
+ include/linux/min_heap.h | 4 +-
+ 140 files changed, 7078 insertions(+), 4634 deletions(-)
+ create mode 100644 fs/bcachefs/btree_journal_iter_types.h
+ create mode 100644 fs/bcachefs/rebalance_format.h
+ create mode 100644 fs/bcachefs/str_hash.c
+Merging fscrypt/for-next (8e929cb546ee Linux 6.12-rc3)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next
+Already up to date.
+Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address)
+$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next
+Already up to date.
+Merging btrfs/for-next (6034a359cbeb Merge branch 'for-next-next-v6.13-20250102' into for-next-20250102)
+$ git merge -m Merge branch 'for-next' of git://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/Makefile | 2 +-
+ fs/btrfs/backref.c | 172 +++---
+ fs/btrfs/backref.h | 16 +-
+ fs/btrfs/bio.c | 11 +-
+ fs/btrfs/block-group.c | 62 +--
+ fs/btrfs/block-rsv.c | 10 +-
+ fs/btrfs/btrfs_inode.h | 2 +-
+ fs/btrfs/ctree.c | 67 ---
+ fs/btrfs/ctree.h | 29 -
+ fs/btrfs/delalloc-space.c | 2 +-
+ fs/btrfs/delayed-inode.c | 43 +-
+ fs/btrfs/delayed-ref.c | 89 +--
+ fs/btrfs/delayed-ref.h | 1 +
+ fs/btrfs/direct-io.c | 3 +-
+ fs/btrfs/disk-io.c | 71 +++
+ fs/btrfs/extent-tree.c | 201 +++----
+ fs/btrfs/extent-tree.h | 7 +-
+ fs/btrfs/extent_io.c | 81 ++-
+ fs/btrfs/file.c | 95 ++--
+ fs/btrfs/free-space-cache.c | 2 +-
+ fs/btrfs/free-space-tree.c | 6 +
+ fs/btrfs/fs.c | 130 +++++
+ fs/btrfs/fs.h | 28 +-
+ fs/btrfs/inode.c | 204 ++++---
+ fs/btrfs/ioctl.c | 98 +---
+ fs/btrfs/ioctl.h | 1 -
+ fs/btrfs/locking.h | 5 +
+ fs/btrfs/misc.h | 28 +
+ fs/btrfs/ordered-data.c | 63 ++-
+ fs/btrfs/ordered-data.h | 9 +
+ fs/btrfs/qgroup.c | 21 +-
+ fs/btrfs/raid-stripe-tree.c | 4 -
+ fs/btrfs/relocation.c | 360 +++++--------
+ fs/btrfs/scrub.c | 146 ++---
+ fs/btrfs/send.c | 3 +-
+ fs/btrfs/space-info.c | 69 ++-
+ fs/btrfs/space-info.h | 15 +-
+ fs/btrfs/subpage.c | 48 +-
+ fs/btrfs/super.c | 20 +-
+ fs/btrfs/sysfs.c | 168 +++++-
+ fs/btrfs/sysfs.h | 5 +
+ fs/btrfs/tests/btrfs-tests.c | 18 +
+ fs/btrfs/tests/btrfs-tests.h | 6 +
+ fs/btrfs/tests/delayed-refs-tests.c | 1015 +++++++++++++++++++++++++++++++++++
+ fs/btrfs/transaction.c | 3 +-
+ fs/btrfs/transaction.h | 18 +-
+ fs/btrfs/tree-checker.c | 94 ++--
+ fs/btrfs/tree-checker.h | 7 +-
+ fs/btrfs/volumes.c | 249 +++++----
+ fs/btrfs/volumes.h | 23 +-
+ fs/btrfs/zoned.c | 154 +++++-
+ fs/btrfs/zoned.h | 7 +
+ include/linux/rbtree.h | 37 ++
+ include/trace/events/btrfs.h | 3 +-
+ 55 files changed, 2864 insertions(+), 1168 deletions(-)
+ create mode 100644 fs/btrfs/tests/delayed-refs-tests.c
+Merging ceph/master (18d44c5d062b ceph: allocate sparse_ext map only for sparse reads)
+$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master
+Already up to date.
+Merging cifs/for-next (fc033cf25e61 Linux 6.13-rc5)
+$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next
+Already up to date.
+Merging configfs/for-next (84147f4e84c4 configfs: improve item creation performance)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next
+Already up to date.
+Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros())
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next
+Auto-merging fs/ecryptfs/crypto.c
+Auto-merging fs/ecryptfs/ecryptfs_kernel.h
+Merge made by the 'ort' strategy.
+ fs/ecryptfs/crypto.c | 2 +-
+ fs/ecryptfs/ecryptfs_kernel.h | 1 -
+ fs/ecryptfs/keystore.c | 4 ++--
+ 3 files changed, 3 insertions(+), 4 deletions(-)
+Merging dlm/next (6784ed98fde5 dlm: return -ENOENT if no comm was found)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next
+Merge made by the 'ort' strategy.
+ fs/dlm/config.c | 2 +-
+ fs/dlm/lock.c | 46 ++++++++++++++++++++++++++++++----------------
+ fs/dlm/lowcomms.c | 3 ++-
+ 3 files changed, 33 insertions(+), 18 deletions(-)
+Merging erofs/dev (a80f578554b7 erofs: micro-optimize superblock checksum)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev
+Merge made by the 'ort' strategy.
+ fs/erofs/erofs_fs.h | 3 ++-
+ fs/erofs/super.c | 30 +++++++++++-------------------
+ fs/erofs/xattr.c | 2 +-
+ 3 files changed, 14 insertions(+), 21 deletions(-)
+Merging exfat/dev (a5324b3a488d exfat: fix the infinite loop in __exfat_free_cluster())
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev
+Merge made by the 'ort' strategy.
+ fs/exfat/dir.c | 3 ++-
+ fs/exfat/fatent.c | 10 ++++++++++
+ fs/exfat/file.c | 6 ++++++
+ fs/exfat/namei.c | 4 ++--
+ 4 files changed, 20 insertions(+), 3 deletions(-)
+Merging exportfs/exportfs-next (adc218676eef Linux 6.12)
+$ git merge -m Merge branch 'exportfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux exportfs/exportfs-next
+Already up to date.
+Merging ext3/for_next (71358f64c41b Merge inotify strcpy hardening.)
+$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next
+Auto-merging fs/btrfs/ioctl.c
+Auto-merging fs/btrfs/super.c
+Auto-merging fs/xfs/xfs_file.c
+Auto-merging include/linux/mm.h
+Auto-merging kernel/fork.c
+Auto-merging mm/filemap.c
+Auto-merging mm/memory.c
+Auto-merging mm/readahead.c
+Merge made by the 'ort' strategy.
+ fs/binfmt_elf.c | 4 +-
+ fs/binfmt_elf_fdpic.c | 4 +-
+ fs/btrfs/ioctl.c | 9 +++
+ fs/btrfs/super.c | 2 +-
+ fs/exec.c | 8 +-
+ fs/ext4/file.c | 3 +
+ fs/ext4/super.c | 3 +
+ fs/fcntl.c | 4 +-
+ fs/isofs/compress.c | 12 ++-
+ fs/notify/fanotify/fanotify.c | 31 ++++++--
+ fs/notify/fanotify/fanotify.h | 15 ++++
+ fs/notify/fanotify/fanotify_user.c | 150 ++++++++++++++++++++++++++++-------
+ fs/notify/fsnotify.c | 83 ++++++++++++++++++-
+ fs/notify/inotify/inotify_fsnotify.c | 2 +-
+ fs/open.c | 62 +++++++++++----
+ fs/xfs/xfs_file.c | 13 +++
+ fs/xfs/xfs_super.c | 2 +-
+ include/linux/fanotify.h | 18 +++--
+ include/linux/fs.h | 72 +++++++++++++++--
+ include/linux/fsnotify.h | 78 ++++++++++++++----
+ include/linux/fsnotify_backend.h | 53 ++++++++++++-
+ include/linux/mm.h | 1 +
+ include/uapi/asm-generic/fcntl.h | 1 -
+ include/uapi/linux/fanotify.h | 18 +++++
+ kernel/fork.c | 12 +--
+ mm/filemap.c | 86 ++++++++++++++++++++
+ mm/memory.c | 19 +++++
+ mm/nommu.c | 7 ++
+ mm/readahead.c | 14 ++++
+ security/selinux/hooks.c | 3 +-
+ 30 files changed, 675 insertions(+), 114 deletions(-)
+Merging ext4/dev (4bbf9020becb Linux 6.13-rc4)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev
+Already up to date.
+Merging f2fs/dev (76f01376df39 f2fs: ensure that node info flags are always initialized)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev
+Merge made by the 'ort' strategy.
+ fs/f2fs/compress.c | 28 ++++++++++++++---------
+ fs/f2fs/data.c | 55 +++++++++++++++++++--------------------------
+ fs/f2fs/f2fs.h | 7 +++++-
+ fs/f2fs/gc.c | 11 +++++----
+ fs/f2fs/inline.c | 2 +-
+ fs/f2fs/node.c | 1 +
+ include/trace/events/f2fs.h | 39 ++++++++++++++++----------------
+ 7 files changed, 74 insertions(+), 69 deletions(-)
+Merging fsverity/for-next (8e929cb546ee Linux 6.12-rc3)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next
+Already up to date.
+Merging fuse/for-next (78f2560fc9fa fuse: Set *nbytesp=0 in fuse_get_user_pages on allocation failure)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next
+Merge made by the 'ort' strategy.
+ fs/fuse/file.c | 31 +++++++++++++++++++------------
+ 1 file changed, 19 insertions(+), 12 deletions(-)
+Merging gfs2/for-next (ead64b20f16e gfs2: reorder capability check last)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next
+Merge made by the 'ort' strategy.
+ fs/gfs2/quota.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging jfs/jfs-next (a174706ba4da jfs: add a check to prevent array-index-out-of-bounds in dbAdjTree)
+$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next
+Already up to date.
+Merging ksmbd/ksmbd-for-next (8ca03b74d2f7 ksmbd: Remove unneeded if check in ksmbd_rdma_capable_netdev())
+$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next
+Merge made by the 'ort' strategy.
+ fs/smb/server/smb2pdu.c | 3 +++
+ fs/smb/server/transport_rdma.c | 3 +--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+Merging nfs/linux-next (4bbf9020becb Linux 6.13-rc4)
+$ 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 (867da60d463b nfs: avoid i_lock contention in nfs_clear_invalid_mapping)
+$ 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 (684ebeadf7a6 nfsd: implement OPEN_ARGS_SHARE_ACCESS_WANT_OPEN_XOR_DELEGATION)
+$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next
+Merge made by the 'ort' strategy.
+ Documentation/sunrpc/xdr/nfs4_1.x | 186 +++++++++++++
+ fs/lockd/svc.c | 8 -
+ fs/nfs/callback.c | 4 -
+ fs/nfs/callback_xdr.c | 1 +
+ fs/nfsd/Makefile | 16 +-
+ fs/nfsd/export.c | 25 +-
+ fs/nfsd/netns.h | 6 -
+ fs/nfsd/nfs4callback.c | 60 +++-
+ fs/nfsd/nfs4proc.c | 31 ++-
+ fs/nfsd/nfs4recover.c | 1 -
+ fs/nfsd/nfs4state.c | 526 +++++++++++++++++++++++++----------
+ fs/nfsd/nfs4xdr.c | 126 +++++++--
+ fs/nfsd/nfs4xdr_gen.c | 256 +++++++++++++++++
+ fs/nfsd/nfs4xdr_gen.h | 25 ++
+ fs/nfsd/nfsctl.c | 42 ---
+ fs/nfsd/nfsd.h | 13 +-
+ fs/nfsd/nfsfh.c | 2 +
+ fs/nfsd/nfssvc.c | 37 ---
+ fs/nfsd/state.h | 36 ++-
+ fs/nfsd/trace.h | 1 -
+ fs/nfsd/xdr4.h | 2 -
+ fs/nfsd/xdr4cb.h | 10 +-
+ include/linux/nfs4.h | 9 +-
+ include/linux/nfs_xdr.h | 5 -
+ include/linux/sunrpc/cache.h | 2 +
+ include/linux/sunrpc/svc.h | 13 +-
+ include/linux/sunrpc/svc_xprt.h | 22 ++
+ include/linux/sunrpc/xdrgen/nfs4_1.h | 153 ++++++++++
+ include/linux/time64.h | 5 +
+ include/uapi/linux/nfs4.h | 7 +-
+ net/sunrpc/cache.c | 53 ++--
+ net/sunrpc/svc_xprt.c | 38 ++-
+ 32 files changed, 1339 insertions(+), 382 deletions(-)
+ create mode 100644 Documentation/sunrpc/xdr/nfs4_1.x
+ create mode 100644 fs/nfsd/nfs4xdr_gen.c
+ create mode 100644 fs/nfsd/nfs4xdr_gen.h
+ create mode 100644 include/linux/sunrpc/xdrgen/nfs4_1.h
+Merging ntfs3/master (55ad333de0f8 fs/ntfs3: Unify inode corruption marking with _ntfs_bad_inode())
+$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master
+Merge made by the 'ort' strategy.
+ fs/ntfs3/attrib.c | 15 ++++++-----
+ fs/ntfs3/dir.c | 2 +-
+ fs/ntfs3/frecord.c | 74 +++++++++++++++++++++++++++-----------------------
+ fs/ntfs3/fsntfs.c | 6 ++++-
+ fs/ntfs3/index.c | 6 ++---
+ fs/ntfs3/inode.c | 3 +++
+ fs/ntfs3/ntfs_fs.h | 21 ++++++++-------
+ fs/ntfs3/record.c | 79 +++++++++++++++++++++++++++++-------------------------
+ 8 files changed, 112 insertions(+), 94 deletions(-)
+Merging orangefs/for-next (96319dacaf15 orangefs: Constify struct kobj_type)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (c8b359dddb41 ovl: Filter invalid inodes with missing lookup function)
+$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next
+Already up to date.
+Merging ubifs/next (b29bf7119d6b jffs2: Fix rtime decompressor)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next
+Already up to date.
+Merging v9fs/9p-next (e0260d530b73 net/9p/usbg: allow building as standalone module)
+$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next
+Already up to date.
+Merging v9fs-ericvh/ericvh/for-next (684a64bf32b6 Merge tag 'nfs-for-6.12-1' of git://git.linux-nfs.org/projects/anna/linux-nfs)
+$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next
+Already up to date.
+Merging xfs/for-next (bf354410af83 Merge tag 'xfs-6.13-fixes_2024-12-12' of https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux into next-rc)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next
+Already up to date.
+Merging zonefs/for-next (c4b3c1332f55 zonefs: add support for FS_IOC_GETFSSYSFSPATH)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next
+Already up to date.
+Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
+$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next
+Already up to date.
+Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
+$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next
+Already up to date.
+Merging vfs-brauner/vfs.all (2d1a3e6a54e3 Merge branch 'vfs-6.14.libfs' into vfs.all)
+$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all
+Auto-merging MAINTAINERS
+Auto-merging fs/nfsd/nfs4recover.c
+Auto-merging fs/nfsd/nfsfh.c
+Auto-merging fs/open.c
+Auto-merging fs/smb/client/file.c
+Auto-merging fs/smb/client/smb2pdu.c
+Auto-merging fs/smb/server/smb_common.c
+Auto-merging include/linux/fs.h
+Auto-merging kernel/trace/trace.h
+Auto-merging mm/shmem.c
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/fiemap.rst | 45 +-
+ Documentation/security/credentials.rst | 5 -
+ MAINTAINERS | 7 +
+ drivers/crypto/ccp/sev-dev.c | 2 +-
+ fs/9p/vfs_addr.c | 6 +-
+ fs/afs/Makefile | 1 +
+ fs/afs/callback.c | 4 +-
+ fs/afs/dir.c | 841 +++++++++++----------
+ fs/afs/dir_edit.c | 385 ++++++----
+ fs/afs/dir_search.c | 227 ++++++
+ fs/afs/file.c | 258 ++++---
+ fs/afs/fs_operation.c | 113 ++-
+ fs/afs/fsclient.c | 62 +-
+ fs/afs/inode.c | 140 +++-
+ fs/afs/internal.h | 143 +++-
+ fs/afs/main.c | 2 +-
+ fs/afs/mntpt.c | 22 +-
+ fs/afs/rotate.c | 4 +-
+ fs/afs/rxrpc.c | 37 +-
+ fs/afs/super.c | 4 +-
+ fs/afs/validation.c | 31 +-
+ fs/afs/vlclient.c | 1 +
+ fs/afs/write.c | 16 +-
+ fs/afs/xdr_fs.h | 2 +-
+ fs/afs/yfsclient.c | 49 +-
+ fs/backing-file.c | 20 +-
+ fs/cachefiles/io.c | 4 +
+ fs/cachefiles/xattr.c | 9 +-
+ fs/ceph/addr.c | 22 +-
+ fs/ext4/inode.c | 3 +-
+ fs/ext4/namei.c | 4 +-
+ fs/fhandle.c | 115 ++-
+ fs/file.c | 22 +-
+ fs/file_table.c | 7 +-
+ fs/fs_context.c | 2 +-
+ fs/libfs.c | 163 ++--
+ fs/mount.h | 46 +-
+ fs/namei.c | 34 +-
+ fs/namespace.c | 224 +++---
+ fs/netfs/Makefile | 5 +-
+ fs/netfs/buffered_read.c | 288 +++----
+ fs/netfs/direct_read.c | 78 +-
+ fs/netfs/direct_write.c | 10 +-
+ fs/netfs/internal.h | 41 +-
+ fs/netfs/main.c | 6 +-
+ fs/netfs/misc.c | 154 ++--
+ fs/netfs/objects.c | 21 +-
+ fs/netfs/read_collect.c | 761 +++++++++++--------
+ fs/netfs/read_pgpriv2.c | 207 ++---
+ fs/netfs/read_retry.c | 211 +++---
+ fs/netfs/read_single.c | 195 +++++
+ fs/netfs/rolling_buffer.c | 226 ++++++
+ fs/netfs/stats.c | 4 +-
+ fs/netfs/write_collect.c | 281 ++-----
+ fs/netfs/write_issue.c | 241 +++++-
+ fs/netfs/write_retry.c | 232 ++++++
+ fs/nfs/fscache.c | 6 +-
+ fs/nfs/fscache.h | 3 +-
+ fs/nfsd/auth.c | 3 +-
+ fs/nfsd/filecache.c | 2 +-
+ fs/nfsd/nfs4recover.c | 3 +-
+ fs/nfsd/nfsfh.c | 1 -
+ fs/nsfs.c | 5 +-
+ fs/open.c | 11 +-
+ fs/overlayfs/dir.c | 4 +-
+ fs/overlayfs/util.c | 4 +-
+ fs/pidfs.c | 298 +++++++-
+ fs/pipe.c | 19 +-
+ fs/pnode.c | 8 +-
+ fs/proc/array.c | 2 +-
+ fs/proc/kcore.c | 81 +-
+ fs/proc/namespaces.c | 2 +-
+ fs/smb/client/cifssmb.c | 12 +-
+ fs/smb/client/file.c | 3 +-
+ fs/smb/client/smb2ops.c | 2 +-
+ fs/smb/client/smb2pdu.c | 15 +-
+ fs/smb/server/smb_common.c | 10 +-
+ include/linux/cred.h | 43 +-
+ include/linux/exportfs.h | 20 +
+ include/linux/fiemap.h | 16 +-
+ include/linux/folio_queue.h | 12 +-
+ include/linux/fs.h | 30 +-
+ include/linux/mount.h | 5 +-
+ include/linux/netfs.h | 54 +-
+ include/linux/pid.h | 5 +-
+ include/linux/pid_namespace.h | 10 +-
+ include/linux/pidfs.h | 3 +
+ include/linux/pseudo_fs.h | 1 +
+ include/linux/rculist.h | 44 ++
+ include/linux/rolling_buffer.h | 61 ++
+ include/linux/seqlock.h | 2 +-
+ include/trace/events/afs.h | 210 ++++-
+ include/trace/events/cachefiles.h | 185 ++---
+ include/trace/events/netfs.h | 229 +++---
+ include/uapi/linux/fiemap.h | 47 +-
+ include/uapi/linux/fs.h | 6 +-
+ kernel/cred.c | 50 --
+ kernel/pid.c | 139 +++-
+ kernel/pid_namespace.c | 43 +-
+ kernel/sysctl.c | 9 -
+ kernel/trace/pid_list.c | 2 +-
+ kernel/trace/trace.h | 2 -
+ kernel/trace/trace_sched_switch.c | 2 +-
+ kernel/watch_queue.c | 4 +-
+ lib/kunit_iov_iter.c | 4 +-
+ mm/shmem.c | 10 +-
+ samples/vfs/.gitignore | 2 +
+ samples/vfs/Makefile | 2 +-
+ samples/vfs/mountinfo.c | 274 +++++++
+ samples/vfs/test-list-all-mounts.c | 235 ++++++
+ security/apparmor/apparmorfs.c | 2 +-
+ tools/testing/selftests/coredump/Makefile | 7 +
+ tools/testing/selftests/coredump/README.rst | 50 ++
+ tools/testing/selftests/coredump/stackdump | 14 +
+ tools/testing/selftests/coredump/stackdump_test.c | 151 ++++
+ .../selftests/{ => filesystems}/nsfs/.gitignore | 1 +
+ .../selftests/{ => filesystems}/nsfs/Makefile | 4 +-
+ .../selftests/{ => filesystems}/nsfs/config | 0
+ .../selftests/filesystems/nsfs/iterate_mntns.c | 149 ++++
+ .../selftests/{ => filesystems}/nsfs/owner.c | 0
+ .../selftests/{ => filesystems}/nsfs/pidns.c | 0
+ .../selftests/filesystems/statmount/Makefile | 2 +-
+ .../filesystems/statmount/listmount_test.c | 66 ++
+ tools/testing/selftests/pid_namespace/.gitignore | 1 +
+ tools/testing/selftests/pid_namespace/Makefile | 2 +-
+ tools/testing/selftests/pid_namespace/pid_max.c | 358 +++++++++
+ tools/testing/selftests/pidfd/.gitignore | 2 +
+ tools/testing/selftests/pidfd/Makefile | 3 +-
+ tools/testing/selftests/pidfd/pidfd.h | 40 +-
+ tools/testing/selftests/pidfd/pidfd_bind_mount.c | 188 +++++
+ .../selftests/pidfd/pidfd_file_handle_test.c | 503 ++++++++++++
+ tools/testing/selftests/pidfd/pidfd_setns_test.c | 47 +-
+ tools/testing/selftests/pidfd/pidfd_wait.c | 47 +-
+ 133 files changed, 7015 insertions(+), 2920 deletions(-)
+ create mode 100644 fs/afs/dir_search.c
+ create mode 100644 fs/netfs/read_single.c
+ create mode 100644 fs/netfs/rolling_buffer.c
+ create mode 100644 fs/netfs/write_retry.c
+ create mode 100644 include/linux/rolling_buffer.h
+ create mode 100644 samples/vfs/mountinfo.c
+ create mode 100644 samples/vfs/test-list-all-mounts.c
+ create mode 100644 tools/testing/selftests/coredump/Makefile
+ create mode 100644 tools/testing/selftests/coredump/README.rst
+ create mode 100755 tools/testing/selftests/coredump/stackdump
+ create mode 100644 tools/testing/selftests/coredump/stackdump_test.c
+ rename tools/testing/selftests/{ => filesystems}/nsfs/.gitignore (78%)
+ rename tools/testing/selftests/{ => filesystems}/nsfs/Makefile (50%)
+ rename tools/testing/selftests/{ => filesystems}/nsfs/config (100%)
+ create mode 100644 tools/testing/selftests/filesystems/nsfs/iterate_mntns.c
+ rename tools/testing/selftests/{ => filesystems}/nsfs/owner.c (100%)
+ rename tools/testing/selftests/{ => filesystems}/nsfs/pidns.c (100%)
+ create mode 100644 tools/testing/selftests/filesystems/statmount/listmount_test.c
+ create mode 100644 tools/testing/selftests/pid_namespace/pid_max.c
+ create mode 100644 tools/testing/selftests/pidfd/pidfd_bind_mount.c
+ create mode 100644 tools/testing/selftests/pidfd/pidfd_file_handle_test.c
+Merging vfs/for-next (5cc68af412a9 fs/overlayfs/namei.c: get rid of include ../internal.h)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next
+Merge made by the 'ort' strategy.
+ fs/overlayfs/namei.c | 2 --
+ 1 file changed, 2 deletions(-)
+Merging mm-hotfixes/mm-hotfixes-unstable (b3078d126f29 mm: fix div by zero in bdi_ratio_from_pages)
+$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable
+Merge made by the 'ort' strategy.
+ arch/x86/mm/init.c | 3 ++-
+ fs/proc/array.c | 2 +-
+ include/linux/swap.h | 1 +
+ lib/alloc_tag.c | 3 +++
+ mm/filemap.c | 2 +-
+ mm/kmemleak.c | 2 +-
+ mm/mempolicy.c | 3 ++-
+ mm/page-writeback.c | 2 ++
+ mm/page_alloc.c | 3 +++
+ mm/vmscan.c | 6 +++++-
+ scripts/decode_stacktrace.sh | 16 ++++++++++++++--
+ tools/testing/shared/linux/maple_tree.h | 2 +-
+ tools/testing/vma/linux/atomic.h | 2 +-
+ 13 files changed, 37 insertions(+), 10 deletions(-)
+Merging fs-current (f66a0bf4e753 Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git)
+$ git merge -m Merge branch 'fs-current' of linux-next fs-current
+Merge made by the 'ort' strategy.
+ fs/9p/vfs_addr.c | 6 ++++-
+ fs/afs/write.c | 5 +++-
+ fs/cachefiles/daemon.c | 14 +++++-----
+ fs/cachefiles/internal.h | 3 ++-
+ fs/cachefiles/security.c | 6 ++---
+ fs/file.c | 1 +
+ fs/fuse/dir.c | 2 ++
+ fs/hfs/super.c | 4 ++-
+ fs/iomap/buffered-io.c | 66 +++++++++++++++++++++++++++++++++++++++++-------
+ fs/jbd2/commit.c | 4 +--
+ fs/jbd2/revoke.c | 2 +-
+ fs/namespace.c | 10 ++++++--
+ fs/netfs/buffered_read.c | 28 +++++++++++---------
+ fs/netfs/direct_write.c | 1 -
+ fs/netfs/read_collect.c | 33 ++++++++++++++----------
+ fs/netfs/read_pgpriv2.c | 4 +++
+ fs/netfs/read_retry.c | 8 +++---
+ fs/netfs/write_collect.c | 14 ++++------
+ fs/netfs/write_issue.c | 2 ++
+ fs/nfs/fscache.c | 9 ++++++-
+ fs/notify/fdinfo.c | 4 +--
+ fs/overlayfs/copy_up.c | 5 ++--
+ fs/qnx6/inode.c | 11 +++-----
+ fs/smb/client/cifssmb.c | 13 +++++++---
+ fs/smb/client/smb2pdu.c | 9 ++++---
+ include/linux/iomap.h | 2 +-
+ include/linux/netfs.h | 7 +++--
+ kernel/gen_kheaders.sh | 1 +
+ 28 files changed, 181 insertions(+), 93 deletions(-)
+Merging kbuild-current/fixes (385443057f47 kbuild: pacman-pkg: provide versioned linux-api-headers package)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (78d4f34e2115 Linux 6.13-rc3)
+$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr
+Already up to date.
+Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes
+Already up to date.
+Merging arm64-fixes/for-next/fixes (926e86205897 arm64/signal: Silence sparse warning storing GCSPR_EL0)
+$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes
+Already up to date.
+Merging arm-soc-fixes/arm/fixes (a31ffd6ed5ee Merge tag 'arm-soc/for-6.13/devicetree-arm64-fixes' of https://github.com/Broadcom/stblinux into arm/fixes)
+$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes
+Already up to date.
+Merging davinci-current/davinci/for-current (9852d85ec9d4 Linux 6.12-rc1)
+$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current
+Already up to date.
+Merging drivers-memory-fixes/fixes (40384c840ea1 Linux 6.13-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 (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes
+Already up to date.
+Merging m68k-current/for-linus (647619b6bd27 m68k: defconfig: Update defconfigs for v6.12-rc1)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus
+Already up to date.
+Merging powerpc-fixes/fixes (05aa156e156e powerpc/pseries/vas: Add close() callback in vas_vm_ops struct)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes
+Already up to date.
+Merging s390-fixes/fixes (282da38b4653 s390/mm: Consider KMSAN modules metadata for paging levels)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
+Already up to date.
+Merging net/main (8ce4f287524c net: libwx: fix firmware mailbox abnormal return)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main
+Merge made by the 'ort' strategy.
+ drivers/net/ethernet/wangxun/libwx/wx_hw.c | 24 ++++++++++------------
+ drivers/net/ieee802154/ca8210.c | 6 +++++-
+ include/net/inet_connection_sock.h | 2 +-
+ net/802/psnap.c | 4 ++--
+ net/mac802154/iface.c | 4 ++++
+ net/sched/cls_flow.c | 3 ++-
+ .../tc-testing/tc-tests/filters/flow.json | 4 ++--
+ 7 files changed, 27 insertions(+), 20 deletions(-)
+Merging bpf/master (ccb98ccef0e5 Merge tag 'platform-drivers-x86-v6.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master
+Already up to date.
+Merging ipsec/master (e952837f3ddb xfrm: state: fix out-of-bounds read during lookup)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
+Merge made by the 'ort' strategy.
+ net/xfrm/xfrm_replay.c | 10 +++---
+ net/xfrm/xfrm_state.c | 89 +++++++++++++++++++++++++++++++++++++++-----------
+ 2 files changed, 76 insertions(+), 23 deletions(-)
+Merging netfilter/main (31f1b55d5d7e net :mana :Request a V2 response version for MANA_QUERY_GF_STAT)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main
+Already up to date.
+Merging ipvs/main (31f1b55d5d7e net :mana :Request a V2 response version for MANA_QUERY_GF_STAT)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main
+Already up to date.
+Merging wireless/for-next (146b6057e1fd wifi: cw1200: Fix potential NULL dereference)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next
+Already up to date.
+Merging ath/for-current (f1d3334d604c wifi: cfg80211: sme: init n_channels before channels[] access)
+$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current
+Already up to date.
+Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master
+Already up to date.
+Merging rdma-fixes/for-rc (45d339fefaa3 RDMA/mlx5: Enable multiplane mode only when it is supported)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (8765429279e7 ALSA: seq: Check UMP support for midi_version change)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
+Already up to date.
+Merging sound-asoc-fixes/for-linus (32c9c06adb5b ASoC: mediatek: disable buffer pre-allocation)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus
+Already up to date.
+Merging regmap-fixes/for-linus (fac04efc5c79 Linux 6.13-rc2)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus
+Already up to date.
+Merging regulator-fixes/for-linus (13221496065f regulator: rename regulator-uv-survival-time-ms according to DT binding)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus
+Already up to date.
+Merging spi-fixes/for-linus (7f9a1eed1ad8 spi: rockchip-sfc: Fix error in remove progress)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus
+Already up to date.
+Merging pci-current/for-linus (bbefc2ff28b8 PCI/bwctrl: Fix NULL pointer deref on unbind and bind)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus
+Merge made by the 'ort' strategy.
+ drivers/pci/pcie/bwctrl.c | 27 ++++++++++++++++++---------
+ 1 file changed, 18 insertions(+), 9 deletions(-)
+Merging driver-core.current/driver-core-linus (78d4f34e2115 Linux 6.13-rc3)
+$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (0cfc36ea5168 serial: stm32: use port lock wrappers for break control)
+$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus
+Merge made by the 'ort' strategy.
+ drivers/tty/serial/8250/8250_core.c | 3 +++
+ drivers/tty/serial/imx.c | 4 ++--
+ drivers/tty/serial/stm32-usart.c | 4 ++--
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+Merging usb.current/usb-linus (dfc51e48bca4 usb: gadget: f_fs: Remove WARN_ON in functionfs_bind)
+$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus
+Merge made by the 'ort' strategy.
+ drivers/usb/chipidea/ci_hdrc_imx.c | 25 +++++++++++++++++--------
+ drivers/usb/class/usblp.c | 7 ++++---
+ drivers/usb/core/hub.c | 6 ++++--
+ drivers/usb/core/port.c | 7 ++++---
+ drivers/usb/dwc3/core.h | 1 +
+ drivers/usb/dwc3/dwc3-am62.c | 1 +
+ drivers/usb/dwc3/gadget.c | 4 +++-
+ drivers/usb/gadget/configfs.c | 6 +++++-
+ drivers/usb/gadget/function/f_fs.c | 2 +-
+ drivers/usb/gadget/function/f_uac2.c | 1 +
+ drivers/usb/gadget/function/u_serial.c | 8 ++++----
+ drivers/usb/host/xhci-plat.c | 3 ++-
+ drivers/usb/typec/tcpm/maxim_contaminant.c | 4 ++--
+ drivers/usb/typec/tcpm/tcpci.c | 25 +++++++++++++++----------
+ drivers/usb/typec/ucsi/ucsi_glink.c | 5 +++++
+ 15 files changed, 69 insertions(+), 36 deletions(-)
+Merging usb-serial-fixes/usb-linus (4bbf9020becb Linux 6.13-rc4)
+$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus
+Already up to date.
+Merging phy/fixes (17194c2998d3 phy: mediatek: phy-mtk-hdmi: add regulator dependency)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes
+Already up to date.
+Merging staging.current/staging-linus (669bf56cb2a1 mailmap: update Bingwu Zhang's email address)
+$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus
+Auto-merging .mailmap
+Merge made by the 'ort' strategy.
+ .mailmap | 2 +
+ drivers/staging/gpib/Kconfig | 8 ++-
+ drivers/staging/gpib/agilent_82350b/Makefile | 2 +-
+ .../staging/gpib/agilent_82350b/agilent_82350b.c | 4 +-
+ drivers/staging/gpib/agilent_82357a/Makefile | 2 +-
+ drivers/staging/gpib/cb7210/Makefile | 2 +-
+ drivers/staging/gpib/cb7210/cb7210.c | 12 ++--
+ drivers/staging/gpib/cb7210/cb7210.h | 4 +-
+ drivers/staging/gpib/cec/Makefile | 2 +-
+ drivers/staging/gpib/cec/cec_gpib.c | 4 +-
+ drivers/staging/gpib/common/gpib_os.c | 54 +----------------
+ drivers/staging/gpib/eastwood/Makefile | 2 +-
+ drivers/staging/gpib/eastwood/fluke_gpib.c | 12 ++--
+ drivers/staging/gpib/eastwood/fluke_gpib.h | 4 +-
+ drivers/staging/gpib/fmh_gpib/fmh_gpib.c | 27 ++++-----
+ drivers/staging/gpib/fmh_gpib/fmh_gpib.h | 4 +-
+ drivers/staging/gpib/gpio/Makefile | 2 +-
+ drivers/staging/gpib/gpio/gpib_bitbang.c | 2 +-
+ drivers/staging/gpib/hp_82335/Makefile | 2 +-
+ drivers/staging/gpib/hp_82335/hp82335.c | 21 +++----
+ drivers/staging/gpib/hp_82341/Makefile | 2 +-
+ drivers/staging/gpib/hp_82341/hp_82341.c | 16 +++---
+ drivers/staging/gpib/include/gpibP.h | 12 +---
+ drivers/staging/gpib/include/gpib_types.h | 3 +-
+ drivers/staging/gpib/include/nec7210.h | 5 +-
+ drivers/staging/gpib/include/tms9914.h | 5 +-
+ drivers/staging/gpib/ines/Makefile | 2 +-
+ drivers/staging/gpib/ines/ines.h | 4 +-
+ drivers/staging/gpib/ines/ines_gpib.c | 22 +++----
+ drivers/staging/gpib/lpvo_usb_gpib/Makefile | 2 +-
+ drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 18 +++---
+ drivers/staging/gpib/nec7210/nec7210.c | 16 +++---
+ drivers/staging/gpib/ni_usb/Makefile | 2 +-
+ drivers/staging/gpib/pc2/Makefile | 2 +-
+ drivers/staging/gpib/pc2/pc2_gpib.c | 16 +++---
+ drivers/staging/gpib/tms9914/Makefile | 2 +-
+ drivers/staging/gpib/tms9914/tms9914.c | 8 +--
+ drivers/staging/gpib/tnt4882/Makefile | 2 +-
+ drivers/staging/gpib/tnt4882/mite.h | 4 +-
+ drivers/staging/gpib/tnt4882/tnt4882_gpib.c | 67 ++++++++++------------
+ 40 files changed, 165 insertions(+), 217 deletions(-)
+Merging iio-fixes/fixes-togreg (f248a1066cf0 iio: light: as73211: fix channel handling in only-color triggered buffer)
+$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/iio/dac/adi,ad5791.yaml | 2 +-
+ .../devicetree/bindings/iio/st,st-sensors.yaml | 1 +
+ drivers/iio/adc/ad4695.c | 98 +++++++++++++++-------
+ drivers/iio/adc/ad7124.c | 3 +
+ drivers/iio/adc/ad7173.c | 10 ++-
+ drivers/iio/adc/ad7606.c | 48 ++++++-----
+ drivers/iio/adc/ad7606.h | 2 +-
+ drivers/iio/adc/ad9467.c | 15 +++-
+ drivers/iio/adc/at91_adc.c | 2 +-
+ drivers/iio/adc/rockchip_saradc.c | 2 +
+ drivers/iio/adc/stm32-dfsdm-adc.c | 13 +--
+ drivers/iio/adc/ti-ads1119.c | 4 +-
+ drivers/iio/adc/ti-ads124s08.c | 4 +-
+ drivers/iio/adc/ti-ads1298.c | 2 +
+ drivers/iio/adc/ti-ads8688.c | 2 +-
+ drivers/iio/dummy/iio_simple_dummy_buffer.c | 2 +-
+ drivers/iio/gyro/fxas21002c_core.c | 11 ++-
+ drivers/iio/imu/inv_icm42600/inv_icm42600.h | 1 +
+ drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 22 ++++-
+ drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 3 +-
+ drivers/iio/imu/kmx61.c | 2 +-
+ drivers/iio/inkern.c | 2 +-
+ drivers/iio/light/as73211.c | 24 +++++-
+ drivers/iio/light/bh1745.c | 2 +
+ drivers/iio/light/hid-sensor-prox.c | 1 +
+ drivers/iio/light/vcnl4035.c | 2 +-
+ drivers/iio/pressure/zpa2326.c | 2 +
+ drivers/iio/temperature/tmp006.c | 2 +
+ drivers/iio/test/Kconfig | 2 +-
+ drivers/iio/test/iio-test-rescale.c | 4 +
+ drivers/staging/iio/frequency/ad9832.c | 2 +-
+ drivers/staging/iio/frequency/ad9834.c | 2 +-
+ 32 files changed, 210 insertions(+), 84 deletions(-)
+Merging counter-current/counter-current (fac04efc5c79 Linux 6.13-rc2)
+$ git merge -m Merge branch 'counter-current' of git://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 (997bb2d75646 Merge tag 'icc-6.13-rc6' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next)
+$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus
+Merge made by the 'ort' strategy.
+ drivers/bus/mhi/host/pci_generic.c | 2 +-
+ drivers/interconnect/icc-clk.c | 10 ++++++++++
+ drivers/interconnect/qcom/icc-rpm.c | 2 +-
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+Merging soundwire-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (fc033cf25e61 Linux 6.13-rc5)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (1863f213d3e8 Input: mma8450 - add chip ID check in probe)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus
+Merge made by the 'ort' strategy.
+ drivers/input/joystick/xpad.c | 1 +
+ drivers/input/misc/mma8450.c | 16 +++++++++++++++-
+ drivers/input/misc/nxp-bbnsm-pwrkey.c | 8 ++++++++
+ 3 files changed, 24 insertions(+), 1 deletion(-)
+Merging crypto-current/master (cd26cd654767 crypto: hisilicon/debugfs - fix the struct pointer incorrectly offset problem)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master
+Already up to date.
+Merging vfio-fixes/for-linus (09dfc8a5f2ce vfio/pci: Fallback huge faults for unaligned pfn)
+$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus
+Merge made by the 'ort' strategy.
+ drivers/vfio/pci/vfio_pci_core.c | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+Merging kselftest-fixes/fixes (777f290ab328 selftests/ftrace: adjust offset for kprobe syntax error test)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes
+Already up to date.
+Merging dmaengine-fixes/fixes (ebc008699fd9 dmaengine: tegra: Return correct DMA status when paused)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes
+Already up to date.
+Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1)
+$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes
+Already up to date.
+Merging mtd-fixes/mtd/fixes (140054a25f85 mtd: rawnand: omap2: Fix build warnings with W=1)
+$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes
+Already up to date.
+Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range)
+$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (8b55f8818900 media: mediatek: vcodec: mark vdec_vp9_slice_map_counts_eob_coef noinline)
+$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes
+Already up to date.
+Merging reset-fixes/reset/fixes (1f8af9712413 reset: rzg2l-usbphy-ctrl: Assign proper of node to the allocated device)
+$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes
+Auto-merging drivers/reset/reset-rzg2l-usbphy-ctrl.c
+Merge made by the 'ort' strategy.
+ drivers/reset/reset-rzg2l-usbphy-ctrl.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging mips-fixes/mips-fixes (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes
+Already up to date.
+Merging at91-fixes/at91-fixes (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes
+Already up to date.
+Merging kvm-fixes/master (8afa5b10af9d Merge tag 'kvm-x86-fixes-6.13-rcN' of https://github.com/kvm-x86/linux into HEAD)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
+Already up to date.
+Merging kvms390-fixes/master (5d450fc8360d selftests: kvm: s390: Add has device attr check to uc_attr_mem_limit selftest)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
+Merge made by the 'ort' strategy.
+ Documentation/virt/kvm/api.rst | 3 +
+ Documentation/virt/kvm/devices/s390_flic.rst | 4 +
+ arch/s390/kvm/interrupt.c | 6 +
+ arch/s390/kvm/vsie.c | 2 +-
+ tools/testing/selftests/kvm/s390x/ucontrol_test.c | 194 ++++++++++++++++++++--
+ 5 files changed, 190 insertions(+), 19 deletions(-)
+Merging hwmon-fixes/hwmon (4bbf9020becb Linux 6.13-rc4)
+$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon
+Already up to date.
+Merging nvdimm-fixes/libnvdimm-fixes (265e98f72bac acpi: nfit: vmalloc-out-of-bounds Read in acpi_nfit_ctl)
+$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes
+Already up to date.
+Merging cxl-fixes/fixes (fc033cf25e61 Linux 6.13-rc5)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes
+Already up to date.
+Merging dma-mapping-fixes/for-linus (78b2770c935f dma-mapping: fix tracing dma_alloc/free with vmalloc'd memory)
+$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus
+Already up to date.
+Merging drivers-x86-fixes/fixes (7e16ae558a87 platform/x86: thinkpad-acpi: Add support for hotkey 0x1401)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes
+Already up to date.
+Merging samsung-krzk-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (8600058ba28a of: Add coreboot firmware to excluded default cells list)
+$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus
+Already up to date.
+Merging dt-krzk-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes
+Already up to date.
+Merging scsi-fixes/fixes (3b2f56860b05 scsi: ufs: qcom: Power down the controller/device during system suspend for SM8550/SM8650 SoCs)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/ufs/core/ufshcd-priv.h | 6 ------
+ drivers/ufs/core/ufshcd.c | 10 ++++++----
+ drivers/ufs/host/ufs-qcom.c | 31 +++++++++++++++++++------------
+ drivers/ufs/host/ufs-qcom.h | 5 +++++
+ include/ufs/ufshcd.h | 2 --
+ 5 files changed, 30 insertions(+), 24 deletions(-)
+Merging drm-fixes/drm-fixes (273b3eb60071 Merge tag 'drm-xe-fixes-2025-01-02' 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 (20e7c5313ffb drm/i915/dg1: Fix power gate sequence.)
+$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel-fixes/for-linux-next-fixes
+Already up to date.
+Merging mmc-fixes/fixes (8d90a86ed053 mmc: sdhci-msm: fix crypto key eviction)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes
+Already up to date.
+Merging rtc-fixes/rtc-fixes (9852d85ec9d4 Linux 6.12-rc1)
+$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes
+Already up to date.
+Merging gnss-fixes/gnss-linus (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (175c71c2acee tools/hv: reduce resource usage in hv_kvp_daemon)
+$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes
+Already up to date.
+Merging risc-v-fixes/fixes (21f1b85c8912 riscv: mm: Do not call pmd dtor on vmemmap page table teardown)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes
+Already up to date.
+Merging riscv-dt-fixes/riscv-dt-fixes (8d19d5a76bf6 riscv: dts: starfive: Fix a typo in StarFive JH7110 pin function definitions)
+$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes
+Merge made by the 'ort' strategy.
+ arch/riscv/boot/dts/starfive/jh7110-pinfunc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging riscv-soc-fixes/riscv-soc-fixes (48808b55b07c firmware: microchip: fix UL_IAP lock check in mpfs_auto_update_state())
+$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes
+Already up to date.
+Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes
+Already up to date.
+Merging spdx/spdx-linus (e70140ba0d2b Get rid of 'remove_new' relic from platform driver struct)
+$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus
+Already up to date.
+Merging gpio-brgl-fixes/gpio/for-current (8bd76b3d3f3a gpio: sim: lock up configfs that an instantiated device depends on)
+$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current
+Merge made by the 'ort' strategy.
+ drivers/gpio/gpio-sim.c | 48 +++++++++++++++++++----
+ drivers/gpio/gpio-virtuser.c | 93 +++++++++++++++++++++++++++++++++-----------
+ 2 files changed, 111 insertions(+), 30 deletions(-)
+Merging gpio-intel-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes
+Already up to date.
+Merging pinctrl-intel-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes
+Already up to date.
+Merging auxdisplay-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes
+Already up to date.
+Merging kunit-fixes/kunit-fixes (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes
+Already up to date.
+Merging memblock-fixes/fixes (180bbad69864 arch_numa: Restore nid checks before registering a memblock with a node)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes
+Already up to date.
+Merging renesas-fixes/fixes (124f4f1a1869 MAINTAINERS: Re-add cancelled Renesas driver sections)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+Merging perf-current/perf-tools (434fffa926b1 perf probe: Fix uninitialized variable)
+$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools
+Already up to date.
+Merging efi-fixes/urgent (145ac100b637 efi/esrt: remove esre_attribute::store())
+$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent
+Already up to date.
+Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
+$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus
+Already up to date.
+Merging battery-fixes/fixes (b3ded6072c56 power: supply: bq24190: Fix BQ24296 Vbus regulator support)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes
+Already up to date.
+Merging iommufd-fixes/for-rc (2ca704f55e22 iommu/arm-smmu-v3: Improve uAPI comment for IOMMU_HW_INFO_TYPE_ARM_SMMUV3)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc
+Already up to date.
+Merging rust-fixes/rust-fixes (78d4f34e2115 Linux 6.13-rc3)
+$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes
+Already up to date.
+Merging w1-fixes/fixes (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes
+Already up to date.
+Merging pmdomain-fixes/fixes (f64f610ec6ab pmdomain: core: add dummy release function to genpd device)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes
+Already up to date.
+Merging i2c-host-fixes/i2c/i2c-host-fixes (fc033cf25e61 Linux 6.13-rc5)
+$ git merge -m Merge branch 'i2c/i2c-host-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes
+Already up to date.
+Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'for-linus' of git://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 (c38448100647 clk: clk-imx8mp-audiomix: fix function signature)
+$ git merge -m Merge branch 'clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes
+Already up to date.
+Merging pwrseq-fixes/pwrseq/for-current (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'pwrseq/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current
+Already up to date.
+Merging thead-dt-fixes/thead-dt-fixes (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'thead-dt-fixes' of https://github.com/pdp7/linux.git thead-dt-fixes/thead-dt-fixes
+Already up to date.
+Merging ftrace-fixes/ftrace/fixes (ab9d98250259 ftrace: Fix function profiler's filtering functionality)
+$ git merge -m Merge branch 'ftrace/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace-fixes/ftrace/fixes
+Merge made by the 'ort' strategy.
+Merging ring-buffer-fixes/ring-buffer/fixes (8cd63406d081 trace/ring-buffer: Do not use TP_printk() formatting for boot mapped buffers)
+$ git merge -m Merge branch 'ring-buffer/fixes' of git://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 (98feccbf32cf tracing: Prevent bad count for tracing_cpumask_write)
+$ git merge -m Merge branch 'trace/fixes' of git://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 (8b55572e5180 tracing/selftests: Add tracefs mount options test)
+$ git merge -m Merge branch 'tracefs/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes
+Already up to date.
+Merging spacemit-fixes/fixes (819837584309 Linux 6.12-rc5)
+$ git merge -m Merge branch 'fixes' of https://github.com/spacemit-com/linux spacemit-fixes/fixes
+Already up to date.
+Merging tip-fixes/tip/urgent (ee68a3902eec Merge branch into tip/master: 'x86/urgent')
+$ git merge -m Merge branch 'tip/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent
+Merge made by the 'ort' strategy.
+ arch/x86/kernel/static_call.c | 1 -
+ 1 file changed, 1 deletion(-)
+Merging slab-fixes/slab/for-next-fixes (b7ffecbe198e memcg: slub: fix SUnreclaim for post charged objects)
+$ git merge -m Merge branch 'slab/for-next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab-fixes/slab/for-next-fixes
+Already up to date.
+Merging drm-msm-fixes/msm-fixes (789384eb1437 drm/msm/dpu: check dpu_plane_atomic_print_state() for valid sspp)
+$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes
+Merge made by the 'ort' strategy.
+ .../bindings/display/msm/qcom,sa8775p-mdss.yaml | 3 ++-
+ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 4 ++--
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 15 +++++++++------
+ drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 3 ---
+ drivers/gpu/drm/msm/dp/dp_audio.c | 2 +-
+ drivers/gpu/drm/msm/dp/dp_catalog.c | 1 -
+ drivers/gpu/drm/msm/dp/dp_ctrl.c | 2 +-
+ drivers/gpu/drm/msm/dp/dp_utils.c | 10 +---------
+ drivers/gpu/drm/msm/dp/dp_utils.h | 2 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_phy_8998.c | 2 +-
+ 10 files changed, 18 insertions(+), 26 deletions(-)
+Merging drm-misc-fixes/for-linux-next-fixes (79d67c499c3f drm: adv7511: Drop dsi single lane support)
+$ 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
+Already up to date.
+Merging linus/for-next (4c538044ee2d vsprintf: don't make the 'binary' version pack small integer arguments)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git linus/for-next
+Merge made by the 'ort' strategy.
+ lib/vsprintf.c | 563 ++++++++++++++++++++++++---------------------------------
+ 1 file changed, 235 insertions(+), 328 deletions(-)
+Merging mm-stable/mm-stable (4bbf9020becb Linux 6.13-rc4)
+$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable
+Already up to date.
+Merging mm-nonmm-stable/mm-nonmm-stable (4bbf9020becb Linux 6.13-rc4)
+$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable
+Already up to date.
+Merging mm/mm-everything (447d70dd19fd foo)
+$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything
+Auto-merging MAINTAINERS
+Auto-merging fs/btrfs/inode.c
+Auto-merging include/linux/sched.h
+Auto-merging kernel/workqueue.c
+Merge made by the 'ort' strategy.
+ Documentation/accounting/delay-accounting.rst | 38 +-
+ Documentation/admin-guide/kernel-parameters.txt | 11 +-
+ Documentation/admin-guide/mm/damon/usage.rst | 309 -----
+ Documentation/admin-guide/mm/memory-hotplug.rst | 4 +-
+ Documentation/admin-guide/mm/transhuge.rst | 82 +-
+ Documentation/core-api/min_heap.rst | 2 +
+ Documentation/core-api/xarray.rst | 24 +-
+ Documentation/filesystems/squashfs.rst | 14 +-
+ Documentation/mm/damon/design.rst | 34 +-
+ Documentation/mm/process_addrs.rst | 48 +-
+ Documentation/mm/split_page_table_lock.rst | 4 +-
+ MAINTAINERS | 34 +-
+ arch/alpha/kernel/core_cia.c | 5 +-
+ arch/alpha/kernel/core_marvel.c | 10 +-
+ arch/alpha/kernel/pci.c | 13 +-
+ arch/alpha/kernel/pci_iommu.c | 10 +-
+ arch/alpha/lib/fpreg.c | 1 -
+ arch/alpha/mm/init.c | 2 +-
+ arch/arc/include/asm/pgalloc.h | 9 +-
+ arch/arc/kernel/unaligned.c | 5 +-
+ arch/arm/include/asm/tlb.h | 10 -
+ arch/arm/kernel/setup.c | 10 +-
+ arch/arm/mach-pxa/sharpsl_pm.c | 8 +-
+ arch/arm/mm/mmu.c | 17 +-
+ arch/arm/mm/nommu.c | 5 +-
+ arch/arm/mm/pgd.c | 16 +-
+ arch/arm64/include/asm/pgalloc.h | 18 -
+ arch/arm64/include/asm/tlb.h | 21 +-
+ arch/arm64/kernel/setup.c | 4 +-
+ arch/arm64/mm/pgd.c | 4 +-
+ arch/csky/include/asm/pgalloc.h | 4 +-
+ arch/hexagon/include/asm/pgalloc.h | 4 +-
+ arch/loongarch/configs/loongson3_defconfig | 5 +-
+ arch/loongarch/include/asm/pgalloc.h | 2 +-
+ arch/loongarch/kernel/setup.c | 2 +-
+ arch/loongarch/mm/init.c | 13 +-
+ arch/loongarch/mm/pgtable.c | 7 +-
+ arch/m68k/configs/amiga_defconfig | 1 -
+ arch/m68k/configs/apollo_defconfig | 1 -
+ arch/m68k/configs/atari_defconfig | 1 -
+ arch/m68k/configs/bvme6000_defconfig | 1 -
+ arch/m68k/configs/hp300_defconfig | 1 -
+ arch/m68k/configs/mac_defconfig | 1 -
+ arch/m68k/configs/multi_defconfig | 1 -
+ arch/m68k/configs/mvme147_defconfig | 1 -
+ arch/m68k/configs/mvme16x_defconfig | 1 -
+ arch/m68k/configs/q40_defconfig | 1 -
+ arch/m68k/configs/sun3_defconfig | 1 -
+ arch/m68k/configs/sun3x_defconfig | 1 -
+ arch/m68k/include/asm/mcf_pgalloc.h | 7 +-
+ arch/m68k/include/asm/motorola_pgalloc.h | 6 +-
+ arch/m68k/include/asm/sun3_pgalloc.h | 4 +-
+ arch/m68k/mm/init.c | 5 +-
+ arch/m68k/mm/mcfmmu.c | 10 +-
+ arch/m68k/mm/motorola.c | 26 +-
+ arch/m68k/mm/sun3mmu.c | 10 +-
+ arch/m68k/sun3/sun3dvma.c | 6 +-
+ arch/microblaze/include/asm/pgalloc.h | 7 +-
+ arch/mips/include/asm/pgalloc.h | 8 +-
+ arch/mips/kernel/setup.c | 5 +-
+ arch/mips/kernel/vdso.c | 10 +-
+ arch/mips/mm/pgtable.c | 8 +-
+ arch/nios2/include/asm/pgalloc.h | 2 +-
+ arch/nios2/mm/pgtable.c | 3 +-
+ arch/openrisc/include/asm/pgalloc.h | 8 +-
+ arch/openrisc/mm/ioremap.c | 5 +-
+ arch/parisc/include/asm/pgalloc.h | 39 +-
+ arch/parisc/mm/init.c | 20 +-
+ arch/powerpc/configs/ppc64_defconfig | 1 -
+ arch/powerpc/include/asm/tlb.h | 1 +
+ arch/powerpc/kernel/dt_cpu_ftrs.c | 10 +-
+ arch/powerpc/kernel/pci_32.c | 5 +-
+ arch/powerpc/kernel/setup-common.c | 5 +-
+ arch/powerpc/kernel/setup_32.c | 8 +-
+ arch/powerpc/kvm/book3s_hv.c | 2 +-
+ arch/powerpc/mm/book3s32/mmu.c | 5 +-
+ arch/powerpc/mm/book3s64/mmu_context.c | 2 +-
+ arch/powerpc/mm/book3s64/pgtable.c | 8 +-
+ arch/powerpc/mm/kasan/init_book3e_64.c | 8 +-
+ arch/powerpc/mm/kasan/init_book3s_64.c | 2 +-
+ arch/powerpc/mm/nohash/mmu_context.c | 16 +-
+ arch/powerpc/mm/pgtable-frag.c | 4 +-
+ arch/powerpc/mm/pgtable_32.c | 7 +-
+ arch/powerpc/platforms/powermac/nvram.c | 5 +-
+ arch/powerpc/platforms/powernv/memtrace.c | 31 +-
+ arch/powerpc/platforms/powernv/opal.c | 5 +-
+ arch/powerpc/platforms/ps3/setup.c | 5 +-
+ arch/powerpc/platforms/pseries/papr_scm.c | 2 +-
+ arch/powerpc/sysdev/msi_bitmap.c | 5 +-
+ arch/riscv/include/asm/pgalloc.h | 72 +-
+ arch/riscv/include/asm/tlb.h | 18 -
+ arch/riscv/kernel/setup.c | 4 +-
+ arch/riscv/mm/init.c | 4 +-
+ arch/riscv/mm/kasan_init.c | 14 +-
+ arch/s390/Kconfig | 1 +
+ arch/s390/include/asm/pgalloc.h | 40 +-
+ arch/s390/include/asm/tlb.h | 43 +-
+ arch/s390/kernel/crash_dump.c | 39 +-
+ arch/s390/kernel/lgr.c | 2 +-
+ arch/s390/kernel/numa.c | 5 +-
+ arch/s390/kernel/setup.c | 20 +-
+ arch/s390/kernel/smp.c | 9 +-
+ arch/s390/kernel/time.c | 4 +-
+ arch/s390/kernel/topology.c | 12 +-
+ arch/s390/mm/cmm.c | 2 +-
+ arch/s390/mm/pgalloc.c | 23 +-
+ arch/sh/include/asm/pgalloc.h | 2 +-
+ arch/sh/mm/init.c | 10 +-
+ arch/sparc/include/asm/tlb_32.h | 1 +
+ arch/sparc/include/asm/tlb_64.h | 1 +
+ arch/sparc/kernel/prom_32.c | 4 +-
+ arch/sparc/mm/init_64.c | 2 +-
+ arch/sparc/mm/srmmu.c | 16 +-
+ arch/um/drivers/net_kern.c | 5 +-
+ arch/um/drivers/vector_kern.c | 5 +-
+ arch/um/include/asm/pgalloc.h | 6 +-
+ arch/um/kernel/load_file.c | 4 +-
+ arch/um/kernel/mem.c | 7 +-
+ arch/x86/Kconfig | 1 +
+ arch/x86/coco/sev/core.c | 4 +-
+ arch/x86/include/asm/percpu.h | 38 +-
+ arch/x86/include/asm/pgalloc.h | 18 -
+ arch/x86/include/asm/tlb.h | 15 +-
+ arch/x86/kernel/acpi/boot.c | 5 +-
+ arch/x86/kernel/apic/io_apic.c | 9 +-
+ arch/x86/kernel/e820.c | 5 +-
+ arch/x86/kernel/kgdb.c | 2 +-
+ arch/x86/kernel/paravirt.c | 8 +
+ arch/x86/kernel/setup.c | 5 +-
+ arch/x86/kernel/vm86_32.c | 5 +-
+ arch/x86/mm/pgtable.c | 47 +-
+ arch/x86/platform/olpc/olpc_dt.c | 6 +-
+ arch/x86/xen/p2m.c | 8 +-
+ arch/xtensa/include/asm/pgalloc.h | 2 +-
+ arch/xtensa/mm/kasan_init.c | 6 +-
+ drivers/accel/habanalabs/common/context.c | 3 +-
+ drivers/accel/habanalabs/common/device.c | 2 +-
+ drivers/accel/habanalabs/common/habanalabs_drv.c | 3 +-
+ drivers/accel/habanalabs/common/habanalabs_ioctl.c | 11 +-
+ drivers/acpi/acpi_extlog.c | 14 +
+ drivers/base/memory.c | 4 +-
+ drivers/block/xen-blkback/blkback.c | 2 +-
+ drivers/block/zram/zram_drv.c | 311 ++---
+ drivers/block/zram/zram_drv.h | 5 +-
+ drivers/clk/ti/clk.c | 5 +-
+ .../gpu/drm/i915/display/intel_display_driver.c | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_chan.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 5 +-
+ drivers/gpu/drm/xe/xe_device.c | 2 +-
+ drivers/infiniband/hw/hfi1/iowait.h | 2 +-
+ drivers/infiniband/hw/usnic/usnic_abi.h | 2 +-
+ drivers/macintosh/smu.c | 6 +-
+ drivers/net/wireless/ath/ath11k/debugfs.c | 2 +-
+ .../broadcom/brcm80211/brcmfmac/fwsignal.c | 2 +-
+ drivers/of/fdt.c | 8 +-
+ drivers/of/unittest.c | 8 +-
+ drivers/scsi/arcmsr/arcmsr_hba.c | 2 +-
+ drivers/scsi/cxlflash/superpipe.c | 2 +-
+ drivers/scsi/lpfc/lpfc_init.c | 18 +-
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 8 +-
+ drivers/scsi/lpfc/lpfc_nvme.c | 2 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 4 +-
+ drivers/scsi/lpfc/lpfc_vmid.c | 2 +-
+ drivers/scsi/pm8001/pm8001_init.c | 2 +-
+ .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 2 +-
+ drivers/tty/tty_io.c | 3 +-
+ drivers/virtio/virtio_mem.c | 103 +-
+ fs/bcachefs/util.h | 2 +-
+ fs/btrfs/inode.c | 1 -
+ fs/ceph/quota.c | 2 +-
+ fs/exec.c | 14 +-
+ fs/f2fs/data.c | 1 -
+ fs/fs-writeback.c | 3 +
+ fs/fuse/file.c | 360 +-----
+ fs/fuse/fuse_i.h | 3 -
+ fs/hugetlbfs/inode.c | 5 -
+ fs/iomap/swapfile.c | 1 -
+ fs/ocfs2/alloc.c | 142 ++-
+ fs/ocfs2/alloc.h | 8 +-
+ fs/ocfs2/aops.c | 337 +++---
+ fs/ocfs2/aops.h | 17 +-
+ fs/ocfs2/cluster/heartbeat.c | 28 +-
+ fs/ocfs2/cluster/masklog.h | 2 +-
+ fs/ocfs2/cluster/quorum.c | 6 +-
+ fs/ocfs2/cluster/tcp.c | 8 +-
+ fs/ocfs2/dlm/dlmapi.h | 2 +-
+ fs/ocfs2/dlm/dlmrecovery.c | 6 +-
+ fs/ocfs2/dlmfs/dlmfs.c | 23 +-
+ fs/ocfs2/dlmglue.c | 28 +-
+ fs/ocfs2/dlmglue.h | 6 +-
+ fs/ocfs2/file.c | 8 +-
+ fs/ocfs2/inode.c | 4 +-
+ fs/ocfs2/ioctl.c | 2 +-
+ fs/ocfs2/journal.c | 2 +-
+ fs/ocfs2/mmap.c | 18 +-
+ fs/ocfs2/move_extents.c | 8 +-
+ fs/ocfs2/ocfs2_fs.h | 8 +-
+ fs/ocfs2/ocfs2_ioctl.h | 2 +-
+ fs/ocfs2/ocfs2_lockid.h | 2 +-
+ fs/ocfs2/ocfs2_trace.h | 20 +-
+ fs/ocfs2/refcounttree.c | 41 +-
+ fs/ocfs2/reservations.h | 4 +-
+ fs/ocfs2/stack_o2cb.c | 2 +-
+ fs/ocfs2/stackglue.h | 2 +-
+ fs/ocfs2/super.c | 587 ++++-----
+ fs/ocfs2/symlink.c | 16 +-
+ fs/ocfs2/xattr.c | 10 +-
+ fs/open.c | 2 +-
+ fs/proc/Kconfig | 19 +
+ fs/proc/vmcore.c | 283 ++++-
+ fs/squashfs/Kconfig | 6 +-
+ fs/squashfs/cache.c | 10 +-
+ fs/squashfs/file.c | 90 +-
+ fs/squashfs/file_cache.c | 6 +-
+ fs/squashfs/file_direct.c | 11 +-
+ fs/squashfs/squashfs.h | 13 +-
+ fs/squashfs/super.c | 21 +-
+ fs/super.c | 2 +-
+ include/asm-generic/early_ioremap.h | 2 +-
+ include/asm-generic/percpu.h | 39 +-
+ include/asm-generic/pgalloc.h | 83 +-
+ include/asm-generic/syscall.h | 2 +-
+ include/asm-generic/tlb.h | 14 +-
+ include/linux/alloc_tag.h | 11 +-
+ include/linux/bitmap.h | 2 +-
+ include/linux/bug.h | 10 +-
+ include/linux/compiler.h | 13 +
+ include/linux/compiler_types.h | 2 +-
+ include/linux/crash_dump.h | 41 +
+ include/linux/damon.h | 59 +-
+ include/linux/delayacct.h | 14 +
+ include/linux/gfp.h | 8 -
+ include/linux/huge_mm.h | 2 +
+ include/linux/hugetlb.h | 7 +
+ include/linux/kasan.h | 4 +-
+ include/linux/kcore.h | 13 -
+ include/linux/list_lru.h | 44 +-
+ include/linux/memblock.h | 6 +
+ include/linux/memcontrol.h | 43 +-
+ include/linux/memfd.h | 23 +-
+ include/linux/memory_hotplug.h | 5 +-
+ include/linux/migrate.h | 6 +-
+ include/linux/min_heap.h | 72 +-
+ include/linux/minmax.h | 219 ++--
+ include/linux/mm.h | 289 ++---
+ include/linux/mm_inline.h | 99 +-
+ include/linux/mm_types.h | 47 +-
+ include/linux/mmap_lock.h | 120 +-
+ include/linux/mmdebug.h | 14 +-
+ include/linux/mmzone.h | 99 +-
+ include/linux/page-isolation.h | 2 +-
+ include/linux/page_ref.h | 9 +-
+ include/linux/pagemap.h | 32 +-
+ include/linux/part_stat.h | 2 +-
+ include/linux/percpu-defs.h | 6 +-
+ include/linux/pgtable.h | 9 +-
+ include/linux/rcuwait.h | 13 +-
+ include/linux/refcount.h | 20 +-
+ include/linux/sched.h | 6 +
+ include/linux/sched/hotplug.h | 4 -
+ include/linux/seqlock.h | 22 +
+ include/linux/slab.h | 6 -
+ include/linux/swap.h | 34 +-
+ include/linux/swap_cgroup.h | 14 +-
+ include/linux/swap_slots.h | 3 -
+ include/linux/task_work.h | 3 -
+ include/linux/types.h | 14 +-
+ include/net/snmp.h | 5 +-
+ include/trace/events/mmap_lock.h | 32 +-
+ include/uapi/linux/taskstats.h | 17 +
+ init/Kconfig | 3 +
+ init/do_mounts_initrd.c | 2 +-
+ init/main.c | 18 +-
+ kernel/capability.c | 8 +-
+ kernel/cpu.c | 9 +-
+ kernel/delayacct.c | 55 +-
+ kernel/fork.c | 103 +-
+ kernel/futex/waitwake.c | 3 +-
+ kernel/irq_work.c | 2 +-
+ kernel/kthread.c | 2 +-
+ kernel/locking/percpu-rwsem.c | 2 +-
+ kernel/power/snapshot.c | 5 +-
+ kernel/rcu/tiny.c | 2 +-
+ kernel/rcu/tree.c | 4 +-
+ kernel/resource.c | 3 +-
+ kernel/sched/core.c | 24 +-
+ kernel/sched/stats.h | 9 +-
+ kernel/task_work.c | 14 +-
+ kernel/ucount.c | 8 +-
+ kernel/watchdog.c | 2 +-
+ kernel/workqueue.c | 2 +-
+ lib/Kconfig.debug | 34 +-
+ lib/Makefile | 2 +-
+ lib/alloc_tag.c | 2 +
+ lib/cpumask.c | 5 +-
+ lib/fault-inject.c | 28 +-
+ lib/inflate.c | 2 -
+ lib/kunit_iov_iter.c | 3 -
+ lib/list_debug.c | 22 +-
+ lib/list_sort.c | 7 +
+ lib/maple_tree.c | 73 +-
+ lib/math/Makefile | 1 +
+ lib/math/tests/Makefile | 1 +
+ lib/math/tests/int_sqrt_kunit.c | 66 +
+ lib/rhashtable.c | 2 +-
+ lib/sort.c | 7 +
+ lib/test_maple_tree.c | 56 +
+ lib/test_min_heap.c | 30 +-
+ lib/test_xarray.c | 692 ++++++-----
+ lib/xarray.c | 78 +-
+ mm/Kconfig | 72 +-
+ mm/Makefile | 1 +
+ mm/cma.h | 2 +-
+ mm/compaction.c | 2 +
+ mm/damon/Kconfig | 30 -
+ mm/damon/Makefile | 1 -
+ mm/damon/core.c | 225 +++-
+ mm/damon/dbgfs.c | 1148 ------------------
+ mm/damon/sysfs-common.h | 16 +-
+ mm/damon/sysfs-schemes.c | 206 +---
+ mm/damon/sysfs.c | 187 ++-
+ mm/damon/tests/.kunitconfig | 7 -
+ mm/damon/tests/dbgfs-kunit.h | 173 ---
+ mm/damon/tests/vaddr-kunit.h | 2 +-
+ mm/debug.c | 83 ++
+ mm/early_ioremap.c | 8 +-
+ mm/filemap.c | 19 -
+ mm/gup.c | 91 +-
+ mm/huge_memory.c | 17 +-
+ mm/hugetlb.c | 128 +-
+ mm/hugetlb_cgroup.c | 1 -
+ mm/init-mm.c | 3 +-
+ mm/internal.h | 60 +-
+ mm/kasan/generic.c | 18 +-
+ mm/kasan/kasan_test_c.c | 4 +-
+ mm/khugepaged.c | 45 +-
+ mm/kmemleak.c | 4 +-
+ mm/kmsan/shadow.c | 8 +-
+ mm/madvise.c | 7 +-
+ mm/memblock.c | 20 +
+ mm/memcontrol-v1.c | 16 +-
+ mm/memcontrol.c | 114 +-
+ mm/memfd.c | 44 +-
+ mm/memory.c | 352 ++++--
+ mm/memory_hotplug.c | 48 +-
+ mm/mempolicy.c | 53 +-
+ mm/migrate.c | 16 +-
+ mm/mmap.c | 578 ++-------
+ mm/mmap_lock.c | 50 +-
+ mm/mmu_gather.c | 25 +-
+ mm/mseal.c | 6 +-
+ mm/nommu.c | 6 +-
+ mm/numa.c | 8 +-
+ mm/oom_kill.c | 8 +-
+ mm/page-writeback.c | 55 +-
+ mm/page_alloc.c | 133 +-
+ mm/page_frag_cache.c | 6 +-
+ mm/page_idle.c | 10 +-
+ mm/page_io.c | 1 -
+ mm/page_isolation.c | 12 +-
+ mm/percpu.c | 70 +-
+ mm/pt_reclaim.c | 71 ++
+ mm/readahead.c | 27 +-
+ mm/rodata_test.c | 7 +-
+ mm/shmem.c | 221 ++--
+ mm/slub.c | 12 +-
+ mm/sparse.c | 5 +-
+ mm/swap.c | 72 +-
+ mm/swap_cgroup.c | 233 ++--
+ mm/swap_slots.c | 78 +-
+ mm/swap_state.c | 1 -
+ mm/swapfile.c | 1264 +++++++++-----------
+ mm/userfaultfd.c | 86 +-
+ mm/util.c | 17 +
+ mm/vma.c | 607 ++++++++--
+ mm/vma.h | 61 +-
+ mm/vma_internal.h | 1 +
+ mm/vmscan.c | 525 ++++----
+ mm/workingset.c | 65 +-
+ mm/zpdesc.h | 182 +++
+ mm/zsmalloc.c | 438 +++----
+ mm/zswap.c | 2 +-
+ net/bluetooth/mgmt.c | 2 +-
+ net/mpls/internal.h | 4 +-
+ net/netfilter/nf_conntrack_proto_sctp.c | 21 +-
+ net/wireless/wext-core.c | 4 +-
+ samples/Kconfig | 2 +
+ samples/Makefile | 2 +
+ samples/damon/Kconfig | 30 +
+ samples/damon/Makefile | 4 +
+ samples/damon/prcl.c | 136 +++
+ samples/damon/wsse.c | 116 ++
+ samples/livepatch/livepatch-callbacks-busymod.c | 3 +-
+ samples/livepatch/livepatch-shadow-fix1.c | 3 +-
+ samples/livepatch/livepatch-shadow-mod.c | 15 +-
+ scripts/checkpatch.pl | 10 +-
+ scripts/coccinelle/misc/secs_to_jiffies.cocci | 22 +
+ scripts/spelling.txt | 37 +
+ security/yama/yama_lsm.c | 4 +-
+ sound/usb/line6/toneport.c | 2 +-
+ tools/accounting/getdelays.c | 67 +-
+ tools/accounting/procacct.c | 5 +-
+ tools/testing/kunit/configs/all_tests.config | 3 -
+ tools/testing/radix-tree/multiorder.c | 4 +
+ tools/testing/selftests/coredump/Makefile | 7 +
+ tools/testing/selftests/coredump/README.rst | 50 +
+ tools/testing/selftests/coredump/stackdump | 14 +
+ tools/testing/selftests/coredump/stackdump_test.c | 151 +++
+ tools/testing/selftests/damon/.gitignore | 3 -
+ tools/testing/selftests/damon/Makefile | 11 +-
+ tools/testing/selftests/damon/config | 1 -
+ tools/testing/selftests/damon/debugfs_attrs.sh | 17 -
+ .../damon/debugfs_duplicate_context_creation.sh | 27 -
+ .../selftests/damon/debugfs_empty_targets.sh | 21 -
+ .../damon/debugfs_huge_count_read_write.sh | 22 -
+ .../selftests/damon/debugfs_rm_non_contexts.sh | 19 -
+ tools/testing/selftests/damon/debugfs_schemes.sh | 19 -
+ .../testing/selftests/damon/debugfs_target_ids.sh | 19 -
+ .../selftests/damon/debugfs_target_ids_pid_leak.c | 68 --
+ .../selftests/damon/debugfs_target_ids_pid_leak.sh | 22 -
+ ...debugfs_target_ids_read_before_terminate_race.c | 80 --
+ ...ebugfs_target_ids_read_before_terminate_race.sh | 14 -
+ .../selftests/damon/huge_count_read_write.c | 46 -
+ tools/testing/selftests/mm/.gitignore | 4 +-
+ tools/testing/selftests/mm/Makefile | 7 +-
+ tools/testing/selftests/mm/guard-pages.c | 73 +-
+ tools/testing/selftests/mm/ksm_tests.c | 2 +-
+ tools/testing/selftests/mm/migration.c | 99 ++
+ tools/testing/selftests/mm/mremap_test.c | 17 +-
+ tools/testing/selftests/mm/mseal_test.c | 8 +-
+ tools/testing/selftests/mm/pagemap_ioctl.c | 118 +-
+ tools/testing/selftests/mm/pkey-arm64.h | 6 +-
+ tools/testing/selftests/mm/pkey-helpers.h | 61 +-
+ tools/testing/selftests/mm/pkey-powerpc.h | 4 +-
+ tools/testing/selftests/mm/pkey-x86.h | 6 +-
+ tools/testing/selftests/mm/pkey_sighandler_tests.c | 32 +-
+ tools/testing/selftests/mm/pkey_util.c | 40 +
+ tools/testing/selftests/mm/protection_keys.c | 212 ++--
+ tools/testing/selftests/mm/seal_elf.c | 137 ---
+ tools/testing/selftests/mm/soft-dirty.c | 2 +-
+ tools/testing/selftests/mm/thp_settings.c | 4 +-
+ tools/testing/selftests/mm/thp_settings.h | 4 +-
+ tools/testing/selftests/mm/uffd-unit-tests.c | 4 +-
+ tools/testing/selftests/mm/vm_util.c | 2 +-
+ tools/testing/selftests/mm/write_to_hugetlbfs.c | 2 +-
+ tools/testing/selftests/pidfd/pidfd_test.c | 2 +-
+ tools/testing/vma/linux/atomic.h | 5 +
+ tools/testing/vma/vma.c | 68 +-
+ tools/testing/vma/vma_internal.h | 312 ++++-
+ 449 files changed, 8938 insertions(+), 9095 deletions(-)
+ create mode 100644 lib/math/tests/int_sqrt_kunit.c
+ delete mode 100644 mm/damon/dbgfs.c
+ delete mode 100644 mm/damon/tests/dbgfs-kunit.h
+ create mode 100644 mm/pt_reclaim.c
+ create mode 100644 mm/zpdesc.h
+ create mode 100644 samples/damon/Kconfig
+ create mode 100644 samples/damon/Makefile
+ create mode 100644 samples/damon/prcl.c
+ create mode 100644 samples/damon/wsse.c
+ create mode 100644 scripts/coccinelle/misc/secs_to_jiffies.cocci
+ create mode 100644 tools/testing/selftests/coredump/Makefile
+ create mode 100644 tools/testing/selftests/coredump/README.rst
+ create mode 100755 tools/testing/selftests/coredump/stackdump
+ create mode 100644 tools/testing/selftests/coredump/stackdump_test.c
+ delete mode 100755 tools/testing/selftests/damon/debugfs_attrs.sh
+ delete mode 100755 tools/testing/selftests/damon/debugfs_duplicate_context_creation.sh
+ delete mode 100755 tools/testing/selftests/damon/debugfs_empty_targets.sh
+ delete mode 100755 tools/testing/selftests/damon/debugfs_huge_count_read_write.sh
+ delete mode 100755 tools/testing/selftests/damon/debugfs_rm_non_contexts.sh
+ delete mode 100755 tools/testing/selftests/damon/debugfs_schemes.sh
+ delete mode 100755 tools/testing/selftests/damon/debugfs_target_ids.sh
+ delete mode 100644 tools/testing/selftests/damon/debugfs_target_ids_pid_leak.c
+ delete mode 100755 tools/testing/selftests/damon/debugfs_target_ids_pid_leak.sh
+ delete mode 100644 tools/testing/selftests/damon/debugfs_target_ids_read_before_terminate_race.c
+ delete mode 100755 tools/testing/selftests/damon/debugfs_target_ids_read_before_terminate_race.sh
+ delete mode 100644 tools/testing/selftests/damon/huge_count_read_write.c
+ create mode 100644 tools/testing/selftests/mm/pkey_util.c
+ delete mode 100644 tools/testing/selftests/mm/seal_elf.c
+Merging kbuild/for-next (b925599c78bc modpost: zero-pad CRC values in modversion_info array)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next
+Auto-merging kernel/gen_kheaders.sh
+Auto-merging scripts/mod/modpost.c
+Auto-merging scripts/package/PKGBUILD
+Merge made by the 'ort' strategy.
+ Documentation/process/changes.rst | 6 ------
+ include/linux/module.h | 4 ++--
+ kernel/gen_kheaders.sh | 42 ++++++++++++++++++------------------
+ kernel/module/internal.h | 10 ++++-----
+ kernel/module/main.c | 2 +-
+ kernel/module/version.c | 2 +-
+ scripts/Makefile.defconf | 13 +++++------
+ scripts/kconfig/Makefile | 4 +++-
+ scripts/kconfig/qconf.cc | 8 +++----
+ scripts/mod/modpost.c | 2 +-
+ scripts/package/PKGBUILD | 1 -
+ scripts/package/builddeb | 24 ++++++++++++++-------
+ scripts/package/install-extmod-build | 33 ++++++++--------------------
+ scripts/package/mkdebian | 2 +-
+ 14 files changed, 71 insertions(+), 82 deletions(-)
+Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list)
+$ 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 (ed60738a9b7e perf stat: Document and clarify outstate members)
+$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next
+Merge made by the 'ort' strategy.
+ .../ABI/testing/sysfs-bus-event_source-devices | 24 +
+ tools/bpf/bpftool/Makefile | 7 +
+ tools/build/Makefile.feature | 46 +-
+ tools/build/feature/Makefile | 6 +-
+ tools/build/feature/test-all.c | 15 +-
+ tools/build/feature/test-libelf-zstd.c | 9 +
+ tools/lib/api/fs/fs.c | 6 +-
+ tools/lib/perf/Documentation/libperf.txt | 1 -
+ tools/lib/perf/cpumap.c | 131 ++---
+ tools/lib/perf/evlist.c | 2 +-
+ tools/lib/perf/include/internal/cpumap.h | 4 -
+ tools/lib/perf/include/perf/cpumap.h | 6 +-
+ tools/lib/perf/libperf.map | 1 -
+ tools/perf/Documentation/perf-config.txt | 2 +-
+ tools/perf/Documentation/perf-ftrace.txt | 11 +
+ tools/perf/Documentation/perf-intel-pt.txt | 596 +++++++++++++--------
+ tools/perf/Documentation/perf-record.txt | 4 +
+ tools/perf/Documentation/perf-trace.txt | 5 +
+ tools/perf/Makefile.config | 93 ++--
+ tools/perf/Makefile.perf | 7 +-
+ tools/perf/arch/powerpc/util/perf_regs.c | 3 +-
+ tools/perf/arch/x86/util/Build | 2 +-
+ tools/perf/arch/x86/util/iostat.c | 4 +
+ tools/perf/bench/inject-buildid.c | 13 +-
+ tools/perf/builtin-annotate.c | 1 +
+ tools/perf/builtin-diff.c | 5 +-
+ tools/perf/builtin-ftrace.c | 131 ++++-
+ tools/perf/builtin-kmem.c | 12 +-
+ tools/perf/builtin-kvm.c | 61 ---
+ tools/perf/builtin-kwork.c | 7 +-
+ tools/perf/builtin-lock.c | 176 ++----
+ tools/perf/builtin-mem.c | 1 +
+ tools/perf/builtin-record.c | 6 +-
+ tools/perf/builtin-report.c | 4 +-
+ tools/perf/builtin-sched.c | 1 +
+ tools/perf/builtin-script.c | 404 +++-----------
+ tools/perf/builtin-stat.c | 27 -
+ tools/perf/builtin-trace.c | 80 ++-
+ tools/perf/builtin.h | 6 -
+ tools/perf/perf.h | 2 +-
+ .../arch/arm64/arm/neoverse-n2-v2/exception.json | 2 +-
+ .../arch/arm64/arm/neoverse-n2-v2/general.json | 2 +-
+ .../arch/arm64/arm/neoverse-n2-v2/l1d_cache.json | 6 +-
+ .../arch/arm64/arm/neoverse-n2-v2/l2_cache.json | 14 +-
+ .../arch/arm64/arm/neoverse-n2-v2/l3_cache.json | 4 +-
+ .../arch/arm64/arm/neoverse-n2-v2/ll_cache.json | 4 +-
+ .../arch/arm64/arm/neoverse-n2-v2/memory.json | 2 +-
+ .../arch/arm64/arm/neoverse-n2-v2/metrics.json | 93 ++--
+ .../arch/arm64/arm/neoverse-n2-v2/retired.json | 4 +-
+ .../arm64/arm/neoverse-n2-v2/spec_operation.json | 14 +-
+ .../arch/arm64/arm/neoverse-n2-v2/stall.json | 8 +-
+ .../arch/arm64/arm/neoverse-n2-v2/tlb.json | 4 +-
+ tools/perf/pmu-events/jevents.py | 16 +-
+ .../perf/scripts/python/Perf-Trace-Util/Context.c | 20 +-
+ tools/perf/scripts/python/mem-phys-addr.py | 179 ++++---
+ tools/perf/tests/Build | 6 +-
+ tools/perf/tests/builtin-test.c | 2 -
+ tools/perf/tests/cpumap.c | 54 +-
+ tools/perf/tests/parse-events.c | 25 +-
+ .../tests/shell/base_probe/test_invalid_options.sh | 5 +-
+ .../tests/shell/base_probe/test_line_semantics.sh | 5 +-
+ tools/perf/tests/shell/common/init.sh | 5 +-
+ .../perf/tests/shell/lib/perf_json_output_lint.py | 14 +-
+ tools/perf/tests/shell/stat+std_output.sh | 2 +-
+ tools/perf/tests/shell/test_intel_pt.sh | 28 +
+ tools/perf/tests/shell/trace_btf_general.sh | 93 ++++
+ tools/perf/tests/sigtrap.c | 20 +-
+ tools/perf/tests/stat.c | 16 +-
+ tools/perf/tests/switch-tracking.c | 2 +-
+ tools/perf/tests/tests-scripts.c | 2 +-
+ tools/perf/tests/tests.h | 10 +
+ tools/perf/tests/workloads/landlock.c | 2 +-
+ tools/perf/trace/beauty/arch_errno_names.sh | 3 +-
+ tools/perf/ui/browsers/scripts.c | 177 +++++-
+ tools/perf/util/Build | 7 +-
+ tools/perf/util/annotate.h | 1 +
+ tools/perf/util/arm-spe-decoder/arm-spe-decoder.h | 9 +
+ tools/perf/util/arm-spe.c | 86 ++-
+ tools/perf/util/auxtrace.c | 67 ++-
+ tools/perf/util/auxtrace.h | 6 +-
+ tools/perf/util/bpf-event.c | 10 +-
+ tools/perf/util/bpf_ftrace.c | 3 +
+ tools/perf/util/bpf_kwork.c | 2 +-
+ tools/perf/util/bpf_kwork_top.c | 2 +-
+ tools/perf/util/bpf_lock_contention.c | 142 ++++-
+ tools/perf/util/bpf_skel/func_latency.bpf.c | 27 +-
+ tools/perf/util/bpf_skel/kwork_top.bpf.c | 4 +-
+ tools/perf/util/bpf_skel/lock_contention.bpf.c | 95 +++-
+ tools/perf/util/bpf_skel/lock_data.h | 15 +-
+ tools/perf/util/bpf_skel/vmlinux/vmlinux.h | 8 +
+ tools/perf/util/btf.c | 27 +
+ tools/perf/util/btf.h | 10 +
+ tools/perf/util/cgroup.c | 2 +-
+ tools/perf/util/config.c | 27 +
+ tools/perf/util/data-convert-bt.c | 10 +-
+ tools/perf/util/data-convert-json.c | 8 +-
+ tools/perf/util/disasm.c | 5 +-
+ tools/perf/util/dlfilter.c | 3 +-
+ tools/perf/util/env.c | 26 +-
+ tools/perf/util/env.h | 6 +-
+ tools/perf/util/evsel.c | 235 ++++++--
+ tools/perf/util/evsel.h | 13 +-
+ tools/perf/util/evsel_config.h | 1 +
+ tools/perf/util/evsel_fprintf.c | 4 +-
+ tools/perf/util/expr.c | 5 +-
+ tools/perf/util/ftrace.h | 3 +
+ tools/perf/util/header.c | 8 +-
+ tools/perf/util/intel-pt-decoder/Build | 18 +-
+ .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 3 -
+ tools/perf/util/kvm-stat.c | 70 +++
+ tools/perf/util/kvm-stat.h | 3 +
+ tools/perf/util/kwork.h | 7 +-
+ tools/perf/util/lock-contention.c | 143 +++++
+ tools/perf/util/lock-contention.h | 20 +-
+ tools/perf/util/mem-events.c | 5 +-
+ tools/perf/util/parse-events.c | 26 +-
+ tools/perf/util/parse-events.h | 1 +
+ tools/perf/util/parse-events.l | 1 +
+ tools/perf/util/path.c | 8 +-
+ tools/perf/util/path.h | 2 +-
+ tools/perf/util/perf_event_attr_fprintf.c | 7 +-
+ tools/perf/util/pmu.c | 31 +-
+ tools/perf/util/probe-event.c | 32 +-
+ tools/perf/util/probe-event.h | 1 +
+ tools/perf/util/probe-finder.c | 15 +
+ tools/perf/util/probe-finder.h | 5 +
+ tools/perf/util/python.c | 341 +++++-------
+ .../perf/util/scripting-engines/trace-event-perl.c | 3 +-
+ .../util/scripting-engines/trace-event-python.c | 66 +--
+ tools/perf/util/session.c | 1 +
+ tools/perf/util/sort.c | 33 +-
+ tools/perf/util/stat-display.c | 242 +++++----
+ tools/perf/util/stat-shadow.c | 5 +-
+ tools/perf/util/stat.h | 3 +-
+ tools/perf/util/stream.c | 7 +-
+ tools/perf/util/stream.h | 10 +-
+ tools/perf/util/string.c | 15 +-
+ tools/perf/util/svghelper.c | 1 +
+ tools/perf/util/synthetic-events.c | 14 +-
+ tools/perf/util/trace-event-parse.c | 2 +-
+ tools/perf/util/trace-event-scripting.c | 187 ++++++-
+ tools/perf/util/trace-event.h | 7 +-
+ tools/perf/util/values.c | 106 ++--
+ tools/perf/util/values.h | 9 +-
+ 144 files changed, 3168 insertions(+), 1924 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices
+ create mode 100644 tools/build/feature/test-libelf-zstd.c
+ create mode 100755 tools/perf/tests/shell/trace_btf_general.sh
+ create mode 100644 tools/perf/util/btf.c
+ create mode 100644 tools/perf/util/btf.h
+ create mode 100644 tools/perf/util/kvm-stat.c
+ create mode 100644 tools/perf/util/lock-contention.c
+Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11)
+$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes
+Already up to date.
+Merging dma-mapping/for-next (aef7ee7649e0 dma-debug: fix physical address calculation for struct dma_debug_entry)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next
+Already up to date.
+Merging asm-generic/master (0af8e32343f8 empty include/asm-generic/vga.h)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master
+Already up to date.
+Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next
+Already up to date.
+Merging arm/for-next (6139f7913689 Merge branches 'fixes' and 'misc' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next
+Merge made by the 'ort' strategy.
+Merging arm64/for-next/core (41a262ab1ba4 Merge branches 'for-next/cpufeature', 'for-next/docs', 'for-next/misc' and 'for-next/mm' into for-next/core)
+$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core
+Auto-merging arch/arm64/include/asm/el2_setup.h
+Auto-merging arch/arm64/kvm/at.c
+Auto-merging arch/arm64/kvm/hyp/nvhe/pkvm.c
+Merge made by the 'ort' strategy.
+ Documentation/arch/arm64/booting.rst | 12 +++++++++
+ arch/arm64/Kconfig | 8 +++---
+ arch/arm64/include/asm/assembler.h | 5 ++++
+ arch/arm64/include/asm/cpucaps.h | 2 ++
+ arch/arm64/include/asm/cpufeature.h | 3 +--
+ arch/arm64/include/asm/el2_setup.h | 6 ++---
+ arch/arm64/include/asm/kvm_arm.h | 2 --
+ arch/arm64/include/asm/kvm_emulate.h | 40 +++++++++++++++---------------
+ arch/arm64/include/asm/kvm_nested.h | 8 +++---
+ arch/arm64/include/asm/mmu.h | 3 ---
+ arch/arm64/include/asm/pgtable-hwdef.h | 6 -----
+ arch/arm64/include/asm/pgtable-prot.h | 7 ++++++
+ arch/arm64/include/asm/pgtable.h | 6 ++---
+ arch/arm64/include/asm/sparsemem.h | 5 +++-
+ arch/arm64/kernel/cpufeature.c | 19 +++++++-------
+ arch/arm64/kernel/pi/idreg-override.c | 9 +++++++
+ arch/arm64/kernel/pi/map_kernel.c | 6 +++++
+ arch/arm64/kvm/arm.c | 8 +++---
+ arch/arm64/kvm/at.c | 6 ++---
+ arch/arm64/kvm/emulate-nested.c | 2 +-
+ arch/arm64/kvm/fpsimd.c | 2 +-
+ arch/arm64/kvm/hyp/include/hyp/switch.h | 4 +--
+ arch/arm64/kvm/hyp/nvhe/hyp-main.c | 4 +--
+ arch/arm64/kvm/hyp/nvhe/pkvm.c | 2 +-
+ arch/arm64/kvm/hyp/nvhe/switch.c | 6 ++---
+ arch/arm64/kvm/hyp/pgtable.c | 33 ++++++++-----------------
+ arch/arm64/kvm/hyp/vhe/switch.c | 16 ++++++------
+ arch/arm64/mm/hugetlbpage.c | 12 +++++++++
+ arch/arm64/mm/init.c | 7 +++++-
+ arch/arm64/mm/proc.S | 5 ++--
+ arch/arm64/tools/gen-sysreg.awk | 2 +-
+ arch/arm64/tools/sysreg | 44 ++++++++++++++++-----------------
+ 32 files changed, 167 insertions(+), 133 deletions(-)
+Merging arm-perf/for-next/perf (f3edf03a4c59 perf: imx9_perf: Introduce AXI filter version to refactor the driver and better extension)
+$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/perf/dwc_pcie_pmu.rst | 6 +-
+ Documentation/admin-guide/perf/hisi-pmu.rst | 5 +-
+ Documentation/admin-guide/perf/index.rst | 2 +
+ .../admin-guide/perf/mrvl-odyssey-ddr-pmu.rst | 80 ++++
+ .../admin-guide/perf/mrvl-odyssey-tad-pmu.rst | 37 ++
+ Documentation/admin-guide/perf/nvidia-pmu.rst | 52 +-
+ drivers/perf/arm-cmn.c | 4 +-
+ drivers/perf/arm_cspmu/nvidia_cspmu.c | 75 +--
+ drivers/perf/dwc_pcie_pmu.c | 72 +--
+ drivers/perf/fsl_imx9_ddr_perf.c | 33 +-
+ drivers/perf/hisilicon/hisi_uncore_cpa_pmu.c | 42 +-
+ drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 61 +--
+ drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 48 +-
+ drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 44 +-
+ drivers/perf/hisilicon/hisi_uncore_pa_pmu.c | 53 +--
+ drivers/perf/hisilicon/hisi_uncore_pmu.c | 160 +++++--
+ drivers/perf/hisilicon/hisi_uncore_pmu.h | 49 +-
+ drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c | 43 +-
+ drivers/perf/hisilicon/hisi_uncore_uc_pmu.c | 45 +-
+ drivers/perf/marvell_cn10k_ddr_pmu.c | 528 ++++++++++++++++++---
+ drivers/perf/marvell_cn10k_tad_pmu.c | 66 ++-
+ 21 files changed, 1007 insertions(+), 498 deletions(-)
+ create mode 100644 Documentation/admin-guide/perf/mrvl-odyssey-ddr-pmu.rst
+ create mode 100644 Documentation/admin-guide/perf/mrvl-odyssey-tad-pmu.rst
+Merging arm-soc/for-next (b5d57dcb2146 soc: document merges)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/blaize.yaml | 40 +++
+ .../devicetree/bindings/arm/stm32/stm32.yaml | 7 +
+ .../bindings/clock/renesas,rzv2h-cpg.yaml | 15 +-
+ .../devicetree/bindings/soc/renesas/renesas.yaml | 33 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ MAINTAINERS | 9 +
+ arch/arm/arm-soc-for-next-contents.txt | 43 +++
+ arch/arm/boot/dts/nuvoton/nuvoton-npcm730-gbs.dts | 6 +-
+ .../dts/nuvoton/nuvoton-npcm750-runbmc-olympus.dts | 2 +-
+ arch/arm/boot/dts/renesas/r7s72100.dtsi | 10 +
+ arch/arm/boot/dts/st/Makefile | 1 +
+ arch/arm/boot/dts/st/stm32mp131.dtsi | 40 +++
+ arch/arm/boot/dts/st/stm32mp135f-dk.dts | 12 +
+ arch/arm/boot/dts/st/stm32mp13xx-dhcor-som.dtsi | 16 +-
+ arch/arm/boot/dts/st/stm32mp151.dtsi | 43 ++-
+ arch/arm/boot/dts/st/stm32mp153c-lxa-tac-gen3.dts | 267 +++++++++++++++
+ arch/arm/boot/dts/st/stm32mp157c-ev1.dts | 9 +
+ arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen1.dts | 84 +++++
+ arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen2.dts | 84 +++++
+ arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 100 +-----
+ arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi | 12 -
+ arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi | 10 -
+ .../arm/boot/dts/st/stm32mp15xx-dhcom-picoitx.dtsi | 10 -
+ arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi | 7 +
+ arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi | 18 +
+ arch/arm/configs/shmobile_defconfig | 1 +
+ arch/arm64/Kconfig.platforms | 5 +
+ arch/arm64/boot/dts/Makefile | 1 +
+ arch/arm64/boot/dts/blaize/Makefile | 2 +
+ arch/arm64/boot/dts/blaize/blaize-blzp1600-cb2.dts | 83 +++++
+ .../arm64/boot/dts/blaize/blaize-blzp1600-som.dtsi | 23 ++
+ arch/arm64/boot/dts/blaize/blaize-blzp1600.dtsi | 205 +++++++++++
+ arch/arm64/boot/dts/renesas/Makefile | 12 +-
+ .../boot/dts/renesas/r8a779a0-falcon-ethernet.dtsi | 242 +++++++++++++
+ arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 10 -
+ .../dts/renesas/r8a779g2-white-hawk-single.dts | 62 +---
+ .../dts/renesas/r8a779g3-white-hawk-single.dts | 16 +
+ arch/arm64/boot/dts/renesas/r8a779g3.dtsi | 12 +
+ .../boot/dts/renesas/r8a779h0-gray-hawk-single.dts | 298 +++++++++++++++-
+ arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 73 ++++
+ arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 237 +++++++++++++
+ arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 374 +++++++++++++++++++++
+ arch/arm64/boot/dts/renesas/r9a09g047e37.dtsi | 18 +
+ arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 18 +
+ arch/arm64/boot/dts/renesas/r9a09g047e57.dtsi | 13 +
+ arch/arm64/boot/dts/renesas/renesas-smarc2.dtsi | 24 ++
+ arch/arm64/boot/dts/renesas/rzg3e-smarc-som.dtsi | 28 ++
+ arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 56 ++-
+ arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi | 83 ++++-
+ arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 18 +-
+ arch/arm64/boot/dts/renesas/ulcb.dtsi | 5 +
+ ...a7212.dtso => white-hawk-ard-audio-da7212.dtso} | 6 +-
+ arch/arm64/boot/dts/renesas/white-hawk-single.dtsi | 73 ++++
+ arch/arm64/boot/dts/st/stm32mp251.dtsi | 234 +++++++++++++
+ arch/arm64/boot/dts/st/stm32mp257f-ev1.dts | 97 ++++++
+ arch/arm64/configs/defconfig | 4 +
+ drivers/soc/renesas/Kconfig | 5 +
+ include/dt-bindings/clock/renesas,r9a09g047-cpg.h | 21 ++
+ 58 files changed, 2993 insertions(+), 246 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/blaize.yaml
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/st/stm32mp153c-lxa-tac-gen3.dts
+ create mode 100644 arch/arm64/boot/dts/blaize/Makefile
+ create mode 100644 arch/arm64/boot/dts/blaize/blaize-blzp1600-cb2.dts
+ create mode 100644 arch/arm64/boot/dts/blaize/blaize-blzp1600-som.dtsi
+ create mode 100644 arch/arm64/boot/dts/blaize/blaize-blzp1600.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a779g3-white-hawk-single.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r8a779g3.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a09g047.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a09g047e37.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts
+ create mode 100644 arch/arm64/boot/dts/renesas/r9a09g047e57.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/renesas-smarc2.dtsi
+ create mode 100644 arch/arm64/boot/dts/renesas/rzg3e-smarc-som.dtsi
+ rename arch/arm64/boot/dts/renesas/{r8a779g0-white-hawk-ard-audio-da7212.dtso => white-hawk-ard-audio-da7212.dtso} (96%)
+ create mode 100644 arch/arm64/boot/dts/renesas/white-hawk-single.dtsi
+ create mode 100644 include/dt-bindings/clock/renesas,r9a09g047-cpg.h
+Merging amlogic/for-next (953913df9c3a Merge branch 'v6.15/arm64-dt' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next
+Merge made by the 'ort' strategy.
+ .../soc/amlogic/amlogic,meson-gx-hhi-sysctrl.yaml | 14 +++++++++
+ arch/arm/boot/dts/amlogic/meson.dtsi | 4 ---
+ arch/arm/boot/dts/amlogic/meson8.dtsi | 18 ++++++++++--
+ arch/arm/boot/dts/amlogic/meson8b-ec100.dts | 2 --
+ arch/arm/boot/dts/amlogic/meson8b-mxq.dts | 2 --
+ arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts | 2 --
+ arch/arm/boot/dts/amlogic/meson8b.dtsi | 18 ++++++++++--
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 24 +++++++++++++---
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 33 ++++++++++++++++++----
+ arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts | 4 ---
+ .../boot/dts/amlogic/meson-g12a-radxa-zero.dts | 4 ---
+ arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 4 ---
+ arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 --
+ arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 4 ---
+ .../dts/amlogic/meson-g12b-a311d-libretech-cc.dts | 2 --
+ .../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 4 ---
+ .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 4 ---
+ .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 ---
+ arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi | 4 ---
+ .../boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 8 ------
+ arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 6 ----
+ .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 6 ----
+ .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 --
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 +++---
+ .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 2 --
+ .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 2 --
+ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 5 +---
+ .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 --
+ arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 2 --
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 25 ++++++++++++++++
+ .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 2 --
+ .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 3 +-
+ .../boot/dts/amlogic/meson-gxl-s905d-p231.dts | 3 +-
+ .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 2 --
+ .../dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 2 --
+ .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 --
+ .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 2 --
+ .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 5 +---
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 25 ++++++++++++++++
+ .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 ---
+ arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 3 +-
+ arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts | 3 +-
+ arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 2 --
+ .../dts/amlogic/meson-libretech-cottonwood.dtsi | 6 ----
+ arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi | 6 ----
+ .../arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 2 --
+ .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 2 --
+ arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 --
+ arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 6 ----
+ 49 files changed, 152 insertions(+), 151 deletions(-)
+Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
+$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next
+Already up to date.
+Merging aspeed/for-next (2eff056a229e ARM: dts: aspeed: Blueridge and Fuji: Fix LED node names)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/aspeed/aspeed.yaml | 2 +
+ arch/arm/boot/dts/aspeed/Makefile | 2 +
+ .../dts/aspeed/aspeed-bmc-ampere-mtjefferson.dts | 622 ++
+ .../dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts | 18 +-
+ .../dts/aspeed/aspeed-bmc-facebook-catalina.dts | 181 +-
+ .../boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 45 +-
+ .../dts/aspeed/aspeed-bmc-facebook-minerva.dts | 557 +-
+ .../dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 1035 +++-
+ .../boot/dts/aspeed/aspeed-bmc-ibm-blueridge.dts | 41 +-
+ .../arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts | 27 +
+ arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-fuji.dts | 111 +-
+ .../arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts | 12 +-
+ arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-sbp1.dts | 6086 ++++++++++++++++++++
+ .../arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 23 +-
+ arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts | 8 +-
+ .../arm/boot/dts/aspeed/aspeed-bmc-vegman-rx20.dts | 6 +-
+ arch/arm/boot/dts/aspeed/aspeed-bmc-vegman.dtsi | 2 +-
+ arch/arm/boot/dts/aspeed/aspeed-g4.dtsi | 93 +-
+ arch/arm/boot/dts/aspeed/aspeed-g5.dtsi | 109 +-
+ arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 249 +-
+ 20 files changed, 8571 insertions(+), 658 deletions(-)
+ create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjefferson.dts
+ create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-sbp1.dts
+Merging at91/at91-next (d4f7b84287de Merge branch 'at91-defconfig' into at91-next)
+$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/atmel-at91.yaml | 7 +
+ .../devicetree/bindings/arm/atmel-sysregs.txt | 14 +-
+ .../bindings/clock/atmel,at91rm9200-pmc.yaml | 2 +
+ .../bindings/clock/atmel,at91sam9x5-sckc.yaml | 1 +
+ .../boot/dts/microchip/at91-sam9x75_curiosity.dts | 54 +-
+ .../boot/dts/microchip/at91-sama5d27_wlsom1_ek.dts | 1 +
+ .../boot/dts/microchip/at91-sama5d29_curiosity.dts | 1 +
+ arch/arm/boot/dts/microchip/sam9x60.dtsi | 12 +
+ arch/arm/boot/dts/microchip/sam9x7.dtsi | 38 +
+ arch/arm/boot/dts/microchip/sama7d65-pinfunc.h | 947 ++++++++++++++
+ arch/arm/configs/multi_v7_defconfig | 1 +
+ arch/arm/configs/sama7_defconfig | 1 +
+ arch/arm/mach-at91/Kconfig | 11 +
+ arch/arm/mach-at91/pm.c | 31 +-
+ drivers/clk/at91/Makefile | 1 +
+ drivers/clk/at91/clk-master.c | 2 +-
+ drivers/clk/at91/clk-sam9x60-pll.c | 2 +-
+ drivers/clk/at91/pmc.c | 1 +
+ drivers/clk/at91/sama7d65.c | 1375 ++++++++++++++++++++
+ drivers/clk/at91/sckc.c | 24 +-
+ drivers/soc/atmel/soc.c | 2 +-
+ include/dt-bindings/clock/at91.h | 8 +
+ 22 files changed, 2503 insertions(+), 33 deletions(-)
+ create mode 100644 arch/arm/boot/dts/microchip/sama7d65-pinfunc.h
+ create mode 100644 drivers/clk/at91/sama7d65.c
+Merging broadcom/next (ed54a84051c6 Merge branch 'devicetree/next' into devicetree-arm64/next)
+$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging arch/arm64/boot/dts/broadcom/bcm2712.dtsi
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/bcm/brcm,bcmbca.yaml | 2 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ arch/arm/boot/dts/broadcom/Makefile | 1 +
+ .../arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts | 20 ++
+ .../dts/broadcom/bcm53340-ubnt-unifi-switch8.dts | 1 -
+ .../boot/dts/broadcom/bcm6846-genexis-xg6846b.dts | 244 +++++++++++++++++++++
+ arch/arm/boot/dts/broadcom/bcm6846.dtsi | 120 ++++++++++
+ arch/arm/boot/dts/broadcom/bcm953012hr.dts | 1 -
+ arch/arm/boot/dts/broadcom/bcm953012k.dts | 1 -
+ arch/arm/boot/dts/broadcom/bcm958522er.dts | 1 -
+ arch/arm/boot/dts/broadcom/bcm958525er.dts | 1 -
+ arch/arm/boot/dts/broadcom/bcm958525xmc.dts | 1 -
+ arch/arm/boot/dts/broadcom/bcm958622hr.dts | 1 -
+ arch/arm/boot/dts/broadcom/bcm958623hr.dts | 1 -
+ arch/arm/boot/dts/broadcom/bcm958625hr.dts | 1 -
+ arch/arm/boot/dts/broadcom/bcm958625k.dts | 1 -
+ arch/arm/boot/dts/broadcom/bcm988312hr.dts | 1 -
+ arch/arm64/boot/dts/broadcom/Makefile | 1 +
+ arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts | 37 ++++
+ arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 42 ++++
+ arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 193 +++++++++++++++-
+ arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 1 +
+ .../dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts | 12 +-
+ .../dts/broadcom/bcmbca/bcm4906-zyxel-ex3510b.dts | 196 +++++++++++++++++
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 18 +-
+ .../arm64/boot/dts/broadcom/northstar2/ns2-svk.dts | 2 -
+ .../arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts | 1 -
+ arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 -
+ 28 files changed, 876 insertions(+), 29 deletions(-)
+ create mode 100644 arch/arm/boot/dts/broadcom/bcm6846-genexis-xg6846b.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-zyxel-ex3510b.dts
+Merging davinci/davinci/for-next (9852d85ec9d4 Linux 6.12-rc1)
+$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next
+Already up to date.
+Merging drivers-memory/for-next (af995eea227f Merge branch 'mem-ctrl-next' into for-next)
+$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next
+Auto-merging drivers/memory/omap-gpmc.c
+Merge made by the 'ort' strategy.
+ drivers/memory/omap-gpmc.c | 33 ++-----
+ drivers/memory/tegra/tegra20-emc.c | 8 +-
+ drivers/memory/ti-aemif.c | 192 ++++++++++++++++++++++---------------
+ include/linux/memory/ti-aemif.h | 32 +++++++
+ include/linux/omap-gpmc.h | 4 -
+ 5 files changed, 159 insertions(+), 110 deletions(-)
+ create mode 100644 include/linux/memory/ti-aemif.h
+Merging imx-mxs/for-next (f89ee1bb86d7 Merge branch 'imx/defconfig' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/fsl.yaml | 9 +
+ MAINTAINERS | 13 +-
+ arch/arm/boot/dts/nxp/imx/imx51-zii-rdu1.dts | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx51-zii-scu2-mezz.dts | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx6q-bx50v3.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi | 5 +-
+ arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi | 6 +-
+ arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx6sl.dtsi | 6 +-
+ arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx6sx.dtsi | 6 +-
+ arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi | 2 +-
+ arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi | 61 +-
+ arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi | 3 +-
+ arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts | 3 +-
+ arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts | 2 +-
+ arch/arm/boot/dts/nxp/imx/imxrt1050.dtsi | 2 +-
+ arch/arm/configs/imx_v6_v7_defconfig | 2 +
+ arch/arm64/boot/dts/freescale/Makefile | 13 +
+ arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi | 2 +-
+ arch/arm64/boot/dts/freescale/imx8mm-phg.dts | 2 +-
+ .../dts/freescale/imx8mn-bsh-smm-s2-display.dtsi | 28 +
+ .../freescale/imx8mp-aristainetos3-adpismarc.dts | 37 +
+ .../imx8mp-aristainetos3-helios-lvds.dtso | 113 ++
+ .../dts/freescale/imx8mp-aristainetos3-helios.dts | 98 ++
+ .../freescale/imx8mp-aristainetos3-proton2s.dts | 161 +++
+ .../freescale/imx8mp-aristainetos3a-som-v1.dtsi | 1107 ++++++++++++++++++++
+ .../freescale/imx8mp-evk-imx-lvds-hdmi-common.dtsi | 29 +
+ .../imx8mp-evk-lvds0-imx-dlvds-hdmi-channel0.dtso | 44 +
+ .../imx8mp-evk-lvds0-imx-lvds-hdmi-common.dtsi | 43 +
+ .../freescale/imx8mp-evk-lvds0-imx-lvds-hdmi.dtso | 28 +
+ .../imx8mp-evk-lvds1-imx-dlvds-hdmi-channel0.dtso | 44 +
+ .../imx8mp-evk-lvds1-imx-lvds-hdmi-common.dtsi | 43 +
+ .../freescale/imx8mp-evk-lvds1-imx-lvds-hdmi.dtso | 28 +
+ arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 6 +
+ .../freescale/imx8mp-skov-revb-mi1010ait-1cp1.dts | 8 +-
+ .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 2 +-
+ arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 2 +-
+ .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 2 -
+ arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi | 2 +-
+ arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 8 +
+ arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts | 92 ++
+ arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts | 14 +
+ .../dts/freescale/imx93-tqma9352-mba93xxca.dts | 8 +-
+ .../dts/freescale/imx93-tqma9352-mba93xxla.dts | 8 +-
+ arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts | 52 +
+ arch/arm64/boot/dts/freescale/imx95.dtsi | 95 +-
+ arch/arm64/configs/defconfig | 1 +
+ drivers/soc/imx/Makefile | 2 +-
+ drivers/soc/imx/soc-imx9.c | 128 +++
+ 52 files changed, 2289 insertions(+), 95 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-aristainetos3-adpismarc.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-aristainetos3-helios-lvds.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-aristainetos3-helios.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-aristainetos3-proton2s.dts
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-aristainetos3a-som-v1.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-imx-lvds-hdmi-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-lvds0-imx-dlvds-hdmi-channel0.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-lvds0-imx-lvds-hdmi-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-lvds0-imx-lvds-hdmi.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-lvds1-imx-dlvds-hdmi-channel0.dtso
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-lvds1-imx-lvds-hdmi-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-lvds1-imx-lvds-hdmi.dtso
+ create mode 100644 drivers/soc/imx/soc-imx9.c
+Merging mediatek/for-next (46ee8eaadb64 Merge branch 'v6.13-next/defconfig' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/mediatek.yaml | 54 +
+ arch/arm64/boot/dts/mediatek/Makefile | 14 +
+ arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 1 +
+ arch/arm64/boot/dts/mediatek/mt6359.dtsi | 1 +
+ .../dts/mediatek/mt7986a-bananapi-bpi-r3-sata.dtso | 34 +
+ arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 29 +-
+ arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 25 +-
+ .../dts/mediatek/mt8183-kukui-jacuzzi-damu.dts | 4 +
+ .../dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts | 15 +
+ .../dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi | 15 +
+ arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 9 +-
+ arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 4 -
+ arch/arm64/boot/dts/mediatek/mt8183.dtsi | 2 +
+ .../dts/mediatek/mt8186-corsola-chinchou-sku0.dts | 18 +
+ .../dts/mediatek/mt8186-corsola-chinchou-sku1.dts | 35 +
+ .../dts/mediatek/mt8186-corsola-chinchou-sku16.dts | 29 +
+ .../boot/dts/mediatek/mt8186-corsola-chinchou.dtsi | 321 ++++++
+ .../dts/mediatek/mt8186-corsola-starmie-sku0.dts | 31 +
+ .../dts/mediatek/mt8186-corsola-starmie-sku1.dts | 31 +
+ .../boot/dts/mediatek/mt8186-corsola-starmie.dtsi | 472 ++++++++
+ arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi | 8 +-
+ arch/arm64/boot/dts/mediatek/mt8186.dtsi | 8 +-
+ .../boot/dts/mediatek/mt8188-geralt-ciri-sku0.dts | 32 +
+ .../boot/dts/mediatek/mt8188-geralt-ciri-sku1.dts | 59 +
+ .../boot/dts/mediatek/mt8188-geralt-ciri-sku2.dts | 59 +
+ .../boot/dts/mediatek/mt8188-geralt-ciri-sku3.dts | 32 +
+ .../boot/dts/mediatek/mt8188-geralt-ciri-sku4.dts | 48 +
+ .../boot/dts/mediatek/mt8188-geralt-ciri-sku5.dts | 72 ++
+ .../boot/dts/mediatek/mt8188-geralt-ciri-sku6.dts | 72 ++
+ .../boot/dts/mediatek/mt8188-geralt-ciri-sku7.dts | 48 +
+ .../boot/dts/mediatek/mt8188-geralt-ciri.dtsi | 316 ++++++
+ arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi | 1156 ++++++++++++++++++++
+ arch/arm64/boot/dts/mediatek/mt8188.dtsi | 7 +
+ arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 3 -
+ arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 2 -
+ arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 10 +-
+ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 3 -
+ .../boot/dts/mediatek/mt8390-genio-700-evk.dts | 48 +
+ .../boot/dts/mediatek/mt8395-genio-1200-evk.dts | 2 -
+ .../dts/mediatek/mt8395-kontron-3-5-sbc-i1200.dts | 1 +
+ .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts | 2 -
+ arch/arm64/boot/dts/mediatek/mt8516.dtsi | 11 +-
+ arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 2 -
+ arch/arm64/configs/defconfig | 6 +
+ 44 files changed, 3058 insertions(+), 93 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sata.dtso
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-chinchou-sku0.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-chinchou-sku1.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-chinchou-sku16.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-chinchou.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-starmie-sku0.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-starmie-sku1.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-starmie.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku1.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku2.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku3.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku4.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku6.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku7.dts
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri.dtsi
+ create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi
+Merging mvebu/for-next (5f55ff35bfaa Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next
+Merge made by the 'ort' strategy.
+Merging omap/for-next (2179717e0b0c Merge branch 'omap-for-v6.14/drivers' into tmp/omap-next-20241213.091057)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/mfd/syscon.yaml | 1 +
+ arch/arm/boot/dts/ti/omap/dra7-l4.dtsi | 2 ++
+ arch/arm/boot/dts/ti/omap/omap3-gta04.dtsi | 16 ++++++++++++++--
+ arch/arm/mach-omap2/powerdomain.c | 2 +-
+ arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts | 5 +++++
+ arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 10 ++++++++--
+ drivers/input/touchscreen/tsc2007.h | 2 ++
+ drivers/input/touchscreen/tsc2007_core.c | 5 ++---
+ 8 files changed, 35 insertions(+), 8 deletions(-)
+Merging qcom/for-next (7511f8fd5520 Merge branches 'arm32-for-6.14', 'arm64-defconfig-for-6.14', 'arm64-fixes-for-6.13', 'arm64-for-6.14', 'clk-for-6.14' and 'drivers-for-6.14' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/qcom-soc.yaml | 9 +-
+ Documentation/devicetree/bindings/arm/qcom.yaml | 57 +
+ .../devicetree/bindings/clock/qcom,qcs615-gcc.yaml | 59 +
+ .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 1 +
+ .../bindings/clock/qcom,sc7280-lpasscorecc.yaml | 27 +-
+ .../bindings/clock/qcom,sm8450-gpucc.yaml | 1 +
+ .../bindings/clock/qcom,x1e80100-gcc.yaml | 6 +-
+ .../devicetree/bindings/firmware/qcom,scm.yaml | 1 +
+ .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 2 +
+ .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 +
+ arch/arm/boot/dts/qcom/qcom-sdx55.dtsi | 5 +-
+ arch/arm/boot/dts/qcom/qcom-sdx65.dtsi | 4 +
+ arch/arm64/boot/dts/qcom/Makefile | 10 +
+ arch/arm64/boot/dts/qcom/ipq5424-rdp466.dts | 59 +
+ arch/arm64/boot/dts/qcom/ipq5424.dtsi | 312 ++
+ arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts | 113 +
+ arch/arm64/boot/dts/qcom/ipq9574.dtsi | 420 ++-
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/msm8917-xiaomi-riva.dts | 333 ++
+ arch/arm64/boot/dts/qcom/msm8917.dtsi | 1954 ++++++++++++
+ arch/arm64/boot/dts/qcom/msm8939.dtsi | 2 +-
+ .../dts/qcom/msm8994-huawei-angler-rev-101.dts | 21 +-
+ arch/arm64/boot/dts/qcom/msm8994.dtsi | 11 +-
+ arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 2 +-
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 9 +-
+ arch/arm64/boot/dts/qcom/pm660l.dtsi | 6 +
+ arch/arm64/boot/dts/qcom/pm8150.dtsi | 2 -
+ arch/arm64/boot/dts/qcom/pm8937.dtsi | 150 +
+ arch/arm64/boot/dts/qcom/pmk8350.dtsi | 72 +
+ arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 8 +
+ arch/arm64/boot/dts/qcom/qcs404.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/qcs615-ride.dts | 289 ++
+ arch/arm64/boot/dts/qcom/qcs615.dtsi | 3330 ++++++++++++++++++++
+ arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 41 +
+ arch/arm64/boot/dts/qcom/qcs8300-ride.dts | 235 ++
+ arch/arm64/boot/dts/qcom/qcs8300.dtsi | 3243 +++++++++++++++++++
+ arch/arm64/boot/dts/qcom/qcs8550-aim300.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/qdu1000-idp.dts | 19 +-
+ arch/arm64/boot/dts/qcom/qdu1000.dtsi | 14 +
+ arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 61 +-
+ arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 5 +
+ arch/arm64/boot/dts/qcom/qru1000-idp.dts | 19 +-
+ arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi | 82 +-
+ arch/arm64/boot/dts/qcom/sa8775p.dtsi | 401 ++-
+ arch/arm64/boot/dts/qcom/sar2130p-qar2130p.dts | 558 ++++
+ arch/arm64/boot/dts/qcom/sar2130p.dtsi | 3123 ++++++++++++++++++
+ arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +-
+ .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 4 -
+ arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 4 -
+ .../boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 1318 ++++++++
+ .../boot/dts/qcom/sc8280xp-microsoft-blackrock.dts | 1325 ++++++++
+ arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 37 +-
+ arch/arm64/boot/dts/qcom/sdm670.dtsi | 194 ++
+ arch/arm64/boot/dts/qcom/sdx75.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sm4250.dtsi | 39 +
+ arch/arm64/boot/dts/qcom/sm4450.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sm6115.dtsi | 87 +
+ arch/arm64/boot/dts/qcom/sm6125.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sm6350.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sm6375.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 5 +
+ .../boot/dts/qcom/sm8150-microsoft-surface-duo.dts | 5 +
+ arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 5 +
+ .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 5 +
+ arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 5 +
+ arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 5 +
+ .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 5 +
+ .../boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 120 +
+ arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts | 5 +
+ arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 7 +
+ arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sm8450.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts | 2 +-
+ .../dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sm8550.dtsi | 18 +-
+ arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sm8650.dtsi | 26 +-
+ arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 1371 ++++++++
+ .../dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts | 289 +-
+ .../boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 60 +-
+ arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 26 +-
+ .../boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 305 +-
+ .../boot/dts/qcom/x1e80100-hp-omnibook-x14.dts | 1693 ++++++++++
+ .../boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 52 +-
+ .../boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 523 ++-
+ arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi | 4 +
+ arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 120 +-
+ arch/arm64/boot/dts/qcom/x1e80100.dtsi | 591 +++-
+ arch/arm64/configs/defconfig | 10 +-
+ drivers/clk/qcom/Kconfig | 19 +
+ drivers/clk/qcom/Makefile | 2 +
+ drivers/clk/qcom/apss-ipq-pll.c | 3 +-
+ drivers/clk/qcom/camcc-x1e80100.c | 7 +
+ drivers/clk/qcom/clk-alpha-pll.c | 2 +
+ drivers/clk/qcom/clk-rpm.c | 27 +-
+ drivers/clk/qcom/clk-rpmh.c | 21 +-
+ drivers/clk/qcom/clk-smd-rpm.c | 25 +-
+ drivers/clk/qcom/clk-spmi-pmic-div.c | 13 +-
+ drivers/clk/qcom/dispcc-qcm2290.c | 2 -
+ drivers/clk/qcom/dispcc-sm6115.c | 2 -
+ drivers/clk/qcom/dispcc-sm6350.c | 7 +-
+ drivers/clk/qcom/gcc-ipq6018.c | 4 +-
+ drivers/clk/qcom/gcc-mdm9607.c | 2 +-
+ drivers/clk/qcom/gcc-qcs615.c | 3034 ++++++++++++++++++
+ drivers/clk/qcom/gcc-sm6350.c | 22 +-
+ drivers/clk/qcom/gcc-sm8550.c | 8 +-
+ drivers/clk/qcom/gcc-sm8650.c | 8 +-
+ drivers/clk/qcom/gpucc-x1p42100.c | 587 ++++
+ drivers/firmware/qcom/qcom_scm.c | 5 +
+ drivers/soc/qcom/Kconfig | 2 +-
+ drivers/soc/qcom/llcc-qcom.c | 1 +
+ drivers/soc/qcom/pmic_glink.c | 72 +-
+ drivers/soc/qcom/pmic_glink_altmode.c | 11 +-
+ drivers/soc/qcom/qcom_pd_mapper.c | 1 +
+ drivers/soc/qcom/rmtfs_mem.c | 2 +-
+ drivers/soc/qcom/smem_state.c | 3 +-
+ include/dt-bindings/clock/qcom,qcs615-gcc.h | 211 ++
+ include/dt-bindings/clock/qcom,x1e80100-gpucc.h | 13 +
+ include/soc/qcom/tcs.h | 26 +-
+ 126 files changed, 27223 insertions(+), 301 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,qcs615-gcc.yaml
+ create mode 100644 arch/arm64/boot/dts/qcom/ipq5424-rdp466.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/ipq5424.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8917-xiaomi-riva.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8917.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/pm8937.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/qcs615-ride.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/qcs615.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/qcs8300-ride.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/qcs8300.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sar2130p-qar2130p.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sar2130p.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
+ create mode 100644 drivers/clk/qcom/gcc-qcs615.c
+ create mode 100644 drivers/clk/qcom/gpucc-x1p42100.c
+ create mode 100644 include/dt-bindings/clock/qcom,qcs615-gcc.h
+Merging renesas/next (42263f922654 Merge branch 'renesas-dts-for-v6.14' into renesas-next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next
+Merge made by the 'ort' strategy.
+ .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 7 ++--
+ arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 40 +++++++++++++++++++++
+ arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 13 +++++++
+ arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 13 +++++++
+ .../boot/dts/renesas/r9a09g057h44-rzv2h-evk.dts | 36 +++++++++----------
+ .../pinctrl/renesas,r9a09g047-pinctrl.h | 41 ++++++++++++++++++++++
+ .../pinctrl/renesas,r9a09g057-pinctrl.h | 31 ++++++++++++++++
+ 7 files changed, 161 insertions(+), 20 deletions(-)
+ create mode 100644 include/dt-bindings/pinctrl/renesas,r9a09g047-pinctrl.h
+ create mode 100644 include/dt-bindings/pinctrl/renesas,r9a09g057-pinctrl.h
+Merging reset/reset/next (3d99f9231bed reset: amlogic: add support for A1 SoC in auxiliary reset driver)
+$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next
+Auto-merging drivers/reset/amlogic/reset-meson-aux.c
+Merge made by the 'ort' strategy.
+ drivers/reset/amlogic/reset-meson-aux.c | 18 +++++++++++
+ .../reset/amlogic,meson-a1-audio-reset.h | 36 ++++++++++++++++++++++
+ 2 files changed, 54 insertions(+)
+ create mode 100644 include/dt-bindings/reset/amlogic,meson-a1-audio-reset.h
+Merging rockchip/for-next (af349ca4d3f8 Merge branch 'v6.14-armsoc/dts64' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next
+Merge made by the 'ort' strategy.
+ arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts | 25 ++++++++-
+ arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 61 ++++++++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3568.dtsi | 1 +
+ arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 2 +
+ arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 3 +-
+ arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 4 ++
+ arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 +-
+ 7 files changed, 95 insertions(+), 3 deletions(-)
+Merging samsung-krzk/for-next (b25a097810df Merge branch 'next/drivers' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'ort' strategy.
+ .../bindings/arm/samsung/samsung-boards.yaml | 3 +
+ .../bindings/clock/samsung,exynos990-clock.yaml | 121 ++
+ .../bindings/soc/samsung/exynos-pmu.yaml | 1 +
+ .../bindings/soc/samsung/exynos-usi.yaml | 1 +
+ .../soc/samsung/samsung,exynos-sysreg.yaml | 8 +
+ MAINTAINERS | 3 +
+ arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 31 +-
+ arch/arm64/boot/dts/exynos/Makefile | 4 +
+ arch/arm64/boot/dts/exynos/exynos850-e850-96.dts | 15 +-
+ arch/arm64/boot/dts/exynos/exynos8895.dtsi | 82 +-
+ arch/arm64/boot/dts/exynos/exynos9810-pinctrl.dtsi | 503 ++++++++
+ arch/arm64/boot/dts/exynos/exynos9810-starlte.dts | 119 ++
+ arch/arm64/boot/dts/exynos/exynos9810.dtsi | 273 ++++
+ arch/arm64/boot/dts/exynos/exynos990-r8s.dts | 115 ++
+ .../boot/dts/exynos/exynos990-x1s-common.dtsi | 98 ++
+ arch/arm64/boot/dts/exynos/exynos990-x1s.dts | 28 +
+ arch/arm64/boot/dts/exynos/exynos990-x1slte.dts | 28 +
+ arch/arm64/boot/dts/exynos/exynos990.dtsi | 50 +-
+ arch/arm64/boot/dts/exynos/exynosautov920.dtsi | 83 ++
+ arch/arm64/boot/dts/exynos/google/gs101-oriole.dts | 104 ++
+ arch/arm64/boot/dts/exynos/google/gs101.dtsi | 5 +-
+ arch/arm64/configs/defconfig | 1 +
+ drivers/clk/samsung/Makefile | 1 +
+ drivers/clk/samsung/clk-exynos990.c | 1343 ++++++++++++++++++++
+ drivers/clk/samsung/clk-pll.c | 14 +-
+ drivers/clk/samsung/clk-pll.h | 3 +
+ include/dt-bindings/clock/samsung,exynos990.h | 236 ++++
+ 27 files changed, 3255 insertions(+), 18 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynos990-clock.yaml
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos9810-pinctrl.dtsi
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos9810-starlte.dts
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos9810.dtsi
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos990-r8s.dts
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos990-x1s-common.dtsi
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos990-x1s.dts
+ create mode 100644 arch/arm64/boot/dts/exynos/exynos990-x1slte.dts
+ create mode 100644 drivers/clk/samsung/clk-exynos990.c
+ create mode 100644 include/dt-bindings/clock/samsung,exynos990.h
+Merging scmi/for-linux-next (b81ada150448 Merge tag 'scmi-updates-6.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
+$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next
+Merge made by the 'ort' strategy.
+ drivers/firmware/arm_scmi/common.h | 4 +-
+ drivers/firmware/arm_scmi/driver.c | 74 ++++++++++++++++------
+ drivers/firmware/arm_scmi/transports/mailbox.c | 1 +
+ drivers/firmware/arm_scmi/transports/smc.c | 1 +
+ drivers/firmware/arm_scmi/transports/virtio.c | 1 +
+ drivers/firmware/arm_scmi/vendors/imx/imx-sm-bbm.c | 5 +-
+ .../firmware/arm_scmi/vendors/imx/imx-sm-misc.c | 5 +-
+ include/linux/scmi_imx_protocol.h | 9 +--
+ 8 files changed, 71 insertions(+), 29 deletions(-)
+Merging sophgo/for-next (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next
+Already up to date.
+Merging spacemit/for-next (6be78731556d riscv: defconfig: enable SpacemiT SoC)
+$ git merge -m Merge branch 'for-next' of https://github.com/spacemit-com/linux spacemit/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 +
+ Documentation/devicetree/bindings/riscv/cpus.yaml | 1 +
+ .../devicetree/bindings/riscv/spacemit.yaml | 28 ++
+ Documentation/devicetree/bindings/serial/8250.yaml | 4 +-
+ .../devicetree/bindings/timer/sifive,clint.yaml | 1 +
+ MAINTAINERS | 9 +
+ arch/riscv/Kconfig.socs | 5 +
+ arch/riscv/boot/dts/Makefile | 1 +
+ arch/riscv/boot/dts/spacemit/Makefile | 2 +
+ arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts | 19 +
+ arch/riscv/boot/dts/spacemit/k1.dtsi | 459 +++++++++++++++++++++
+ arch/riscv/configs/defconfig | 1 +
+ 12 files changed, 530 insertions(+), 1 deletion(-)
+ create mode 100644 Documentation/devicetree/bindings/riscv/spacemit.yaml
+ create mode 100644 arch/riscv/boot/dts/spacemit/Makefile
+ create mode 100644 arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts
+ create mode 100644 arch/riscv/boot/dts/spacemit/k1.dtsi
+Merging stm32/stm32-next (b7ebfb84a09d arm64: dts: st: enable imx335/csi/dcmipp pipeline on stm32mp257f-ev1)
+ 47d9d3c1d424 ("ARM: dts: stm32: add counter subnodes on stm32mp135f-dk")
+ 7db93f0277d9 ("arm64: dts: st: add csi & dcmipp node in stm32mp25")
+ abf9b56d5dc5 ("ARM: dts: stm32: Swap USART3 and UART8 alias on STM32MP15xx DHCOM SoM")
+ ae281e200680 ("ARM: dts: stm32: populate all timer counter nodes on stm32mp13")
+ b7ebfb84a09d ("arm64: dts: st: enable imx335/csi/dcmipp pipeline on stm32mp257f-ev1")
+ ba8ff583891a ("ARM: dts: stm32: populate all timer counter nodes on stm32mp15")
+ db10d90e8f16 ("ARM: dts: stm32: add counter subnodes on stm32mp157c-ev1")
+ ee843399b312 ("ARM: dts: stm32: add counter subnodes on stm32mp157 dk boards")
+$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next
+Merge made by the 'ort' strategy.
+ include/linux/bus/stm32_firewall_device.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging sunxi/sunxi/for-next (cc47f07a40d6 Merge branches 'sunxi/clk-fixes-for-6.13', 'sunxi/dt-for-6.14' and 'sunxi/clk-for-6.14' into sunxi/for-next)
+$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next
+Auto-merging drivers/clk/sunxi-ng/ccu-sun50i-a100.c
+Auto-merging drivers/clk/sunxi-ng/ccu-sun50i-a64.c
+Merge made by the 'ort' strategy.
+ .../sram/allwinner,sun4i-a10-system-control.yaml | 4 ++-
+ .../dts/allwinner/suniv-f1c100s-licheepi-nano.dts | 8 ++++++
+ arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi | 24 ++++++++++++++++
+ arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 33 ++++++++++++++++++++++
+ .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 ++
+ .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 2 ++
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 2 ++
+ .../boot/dts/allwinner/sun50i-h313-tanix-tx1.dts | 1 +
+ drivers/clk/sunxi-ng/ccu-sun50i-a100.c | 6 ++--
+ drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 13 +++------
+ drivers/clk/sunxi-ng/ccu-sun50i-a64.h | 2 --
+ include/dt-bindings/clock/sun50i-a64-ccu.h | 2 ++
+ 12 files changed, 84 insertions(+), 15 deletions(-)
+Merging tee/next (a7562ff02879 Merge branch 'optee_for_v6.14' into next)
+$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next
+Merge made by the 'ort' strategy.
+ drivers/tee/optee/smc_abi.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+Merging tegra/for-next (ca398b41b0a3 Merge branch for-6.14/arm/dt into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging thead-dt/thead-dt-for-next (c95c1362e5bc riscv: dts: thead: Add mailbox node)
+$ git merge -m Merge branch 'thead-dt-for-next' of https://github.com/pdp7/linux.git thead-dt/thead-dt-for-next
+Merge made by the 'ort' strategy.
+ arch/riscv/boot/dts/thead/th1520.dtsi | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+Merging ti/ti-next (4ec85d2d13f1 Merge branches 'ti-drivers-soc-next' and 'ti-k3-maintainer-next' into ti-next)
+$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/soc/ti/ti,pruss.yaml | 10 ++
+ MAINTAINERS | 1 +
+ arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 1 -
+ arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi | 11 ++
+ arch/arm64/boot/dts/ti/k3-am625-sk.dts | 7 -
+ arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 1 -
+ .../boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 5 +
+ arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 4 +
+ arch/arm64/boot/dts/ti/k3-am62x-phyboard-lyra.dtsi | 24 ++++
+ arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 6 +-
+ arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 22 ++-
+ .../boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts | 6 -
+ arch/arm64/boot/dts/ti/k3-am67a-beagley-ai.dts | 158 +++++++++++++++++++++
+ arch/arm64/boot/dts/ti/k3-am69-sk.dts | 8 ++
+ .../boot/dts/ti/k3-j7200-common-proc-board.dts | 4 +
+ arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 7 +
+ arch/arm64/boot/dts/ti/k3-j722s-evm.dts | 14 ++
+ .../boot/dts/ti/k3-j784s4-j742s2-evm-common.dtsi | 8 ++
+ .../boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi | 22 +--
+ .../dts/ti/k3-j784s4-j742s2-mcu-wakeup-common.dtsi | 12 +-
+ arch/arm64/boot/dts/ti/k3-pinctrl.h | 19 +++
+ include/linux/pruss_driver.h | 12 +-
+ 22 files changed, 321 insertions(+), 41 deletions(-)
+Merging xilinx/for-next (18b1e1ae30c7 arm64: zynqmp: add clock-output-names property in clock nodes)
+$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next
+Merge made by the 'ort' strategy.
+ arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+Merging clk/clk-next (b24529d75a73 Merge branch 'clk-samsung' into clk-next)
+$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/clock/renesas,5p35023.yaml | 1 +
+ drivers/clk/clk-versaclock3.c | 67 ++++++++++++++++------
+ drivers/clk/clk.c | 4 +-
+ drivers/clk/davinci/pll.c | 32 +----------
+ drivers/clk/mediatek/clk-mt2701-aud.c | 10 ++++
+ drivers/clk/mediatek/clk-mt2701-bdp.c | 1 +
+ drivers/clk/mediatek/clk-mt2701-img.c | 1 +
+ drivers/clk/mediatek/clk-mt2701-mm.c | 1 +
+ drivers/clk/mediatek/clk-mt2701-vdec.c | 1 +
+ drivers/clk/mmp/clk-pxa1908-apbc.c | 4 +-
+ drivers/clk/mmp/clk-pxa1908-apbcp.c | 4 +-
+ drivers/clk/mmp/clk-pxa1908-mpmu.c | 4 +-
+ drivers/clk/renesas/r8a779h0-cpg-mssr.c | 4 ++
+ drivers/clk/renesas/r9a06g032-clocks.c | 29 +++++++++-
+ drivers/clk/renesas/r9a08g045-cpg.c | 47 +++++++++++++++
+ drivers/clk/renesas/r9a09g057-cpg.c | 45 +++++++++++++++
+ drivers/clk/renesas/renesas-cpg-mssr.c | 2 +-
+ drivers/clk/renesas/rzv2h-cpg.c | 44 ++++++++++++--
+ drivers/clk/renesas/rzv2h-cpg.h | 18 +++++-
+ drivers/pci/controller/dwc/pci-exynos.c | 2 +-
+ drivers/soc/mediatek/mtk-pmic-wrap.c | 4 +-
+ include/linux/clk.h | 9 ---
+ include/linux/platform_data/clk-davinci-pll.h | 21 -------
+ 23 files changed, 259 insertions(+), 96 deletions(-)
+ delete mode 100644 include/linux/platform_data/clk-davinci-pll.h
+Merging clk-imx/for-next (48806be08636 clk: imx: Apply some clks only for i.MX93)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next
+Merge made by the 'ort' strategy.
+ arch/arm64/boot/dts/freescale/imx93.dtsi | 2 +-
+ drivers/clk/imx/clk-imx8mp.c | 5 +++--
+ drivers/clk/imx/clk-imx93.c | 32 +++++++++++++++++---------------
+ drivers/clk/imx/clk-pll14xx.c | 2 ++
+ include/dt-bindings/clock/imx93-clock.h | 1 +
+ 5 files changed, 24 insertions(+), 18 deletions(-)
+Merging clk-renesas/renesas-clk (75e050951f4f clk: renesas: r9a09g057: Add clock and reset entries for GIC)
+$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk
+Merge made by the 'ort' strategy.
+ drivers/clk/renesas/Kconfig | 7 +-
+ drivers/clk/renesas/Makefile | 1 +
+ drivers/clk/renesas/r8a779g0-cpg-mssr.c | 4 +
+ drivers/clk/renesas/r9a09g047-cpg.c | 150 ++++++++++++++++++++++++++++++
+ drivers/clk/renesas/r9a09g057-cpg.c | 160 ++++++++++++++++++++++----------
+ drivers/clk/renesas/rzv2h-cpg.c | 154 +++++++++++++++++++++++++-----
+ drivers/clk/renesas/rzv2h-cpg.h | 31 +++++--
+ 7 files changed, 426 insertions(+), 81 deletions(-)
+ create mode 100644 drivers/clk/renesas/r9a09g047-cpg.c
+Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not working)
+$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next
+Merge made by the 'ort' strategy.
+ arch/csky/mm/fault.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging loongarch/loongarch-next (7f71507851fc LoongArch: KVM: Protect kvm_io_bus_{read,write}() with SRCU)
+$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next
+Already up to date.
+Merging m68k/for-next (e419ddeabe7e m68k: Use kernel's generic muldi3 libgcc function)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next
+Merge made by the 'ort' strategy.
+ arch/Kconfig | 8 ++++
+ arch/m68k/Kconfig | 2 +
+ arch/m68k/include/asm/libgcc.h | 20 +++++++++
+ arch/m68k/lib/Makefile | 2 +-
+ arch/m68k/lib/muldi3.c | 97 ------------------------------------------
+ include/linux/libgcc.h | 4 ++
+ 6 files changed, 35 insertions(+), 98 deletions(-)
+ create mode 100644 arch/m68k/include/asm/libgcc.h
+ delete mode 100644 arch/m68k/lib/muldi3.c
+Merging m68knommu/for-next (d02c39f0368b m68k: coldfire: Use proper clock rate for timers)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next
+Merge made by the 'ort' strategy.
+ arch/m68k/coldfire/m5441x.c | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+Merging microblaze/next (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next
+Already up to date.
+Merging mips/mips-next (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next
+Already up to date.
+Merging openrisc/for-next (252b06459e7a openrisc: migrate to the generic rule for built-in DTB)
+$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next
+Merge made by the 'ort' strategy.
+ arch/openrisc/Kbuild | 1 -
+ arch/openrisc/Kconfig | 3 ++-
+ arch/openrisc/boot/dts/Makefile | 2 +-
+ arch/openrisc/configs/or1klitex_defconfig | 2 +-
+ arch/openrisc/configs/or1ksim_defconfig | 2 +-
+ arch/openrisc/configs/simple_smp_defconfig | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+Merging parisc-hd/for-next (df195d931a33 parisc: Remove memcpy_toio and memset_io)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next
+Merge made by the 'ort' strategy.
+ arch/parisc/include/asm/io.h | 4 ----
+ arch/parisc/kernel/parisc_ksyms.c | 2 --
+ arch/parisc/lib/io.c | 47 ---------------------------------------
+ 3 files changed, 53 deletions(-)
+Merging powerpc/next (26bef359bc4f powerpc: Use str_on_off() helper in check_cache_coherency())
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next
+Auto-merging MAINTAINERS
+Auto-merging arch/powerpc/kernel/setup-common.c
+Merge made by the 'ort' strategy.
+ .../ABI/{testing => obsolete}/sysfs-class-cxl | 3 +
+ MAINTAINERS | 4 +-
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/include/asm/hugetlb.h | 9 ++
+ arch/powerpc/include/asm/thread_info.h | 9 +-
+ arch/powerpc/include/asm/time.h | 2 +-
+ arch/powerpc/kernel/interrupt.c | 4 +-
+ arch/powerpc/kernel/misc_32.S | 26 -----
+ arch/powerpc/kernel/process.c | 4 +-
+ arch/powerpc/kernel/setup-common.c | 4 +-
+ arch/powerpc/kernel/vdso32_wrapper.S | 2 +-
+ arch/powerpc/kernel/vdso64_wrapper.S | 2 +-
+ arch/powerpc/lib/vmx-helper.c | 2 +-
+ arch/powerpc/platforms/8xx/cpm1.c | 119 +++++++++++----------
+ arch/powerpc/xmon/xmon.c | 6 +-
+ drivers/macintosh/mac_hid.c | 2 +-
+ drivers/misc/cxl/Kconfig | 6 +-
+ drivers/misc/cxl/of.c | 2 +
+ drivers/misc/cxl/pci.c | 2 +
+ drivers/scsi/cxlflash/Kconfig | 6 +-
+ drivers/scsi/cxlflash/main.c | 2 +
+ tools/testing/selftests/powerpc/include/pkeys.h | 8 ++
+ tools/testing/selftests/powerpc/ptrace/core-pkey.c | 31 +-----
+ .../testing/selftests/powerpc/ptrace/ptrace-pkey.c | 26 +----
+ tools/testing/selftests/powerpc/vphn/test-vphn.c | 2 +-
+ 25 files changed, 120 insertions(+), 164 deletions(-)
+ rename Documentation/ABI/{testing => obsolete}/sysfs-class-cxl (99%)
+Merging risc-v/for-next (fac04efc5c79 Linux 6.13-rc2)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next
+Already up to date.
+Merging riscv-dt/riscv-dt-for-next (708d55db3edb riscv: dts: starfive: jh7110-milkv-mars: enable usb0 host function)
+$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next
+Merge made by the 'ort' strategy.
+ arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts | 18 +++++++++++++++++-
+ arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts | 18 +++++++++++++++++-
+ 2 files changed, 34 insertions(+), 2 deletions(-)
+Merging riscv-soc/riscv-soc-for-next (a5362510bafc Merge branch 'riscv-config-for-next' into riscv-soc-for-next)
+$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next
+Auto-merging arch/riscv/configs/defconfig
+Merge made by the 'ort' strategy.
+ arch/riscv/configs/defconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging s390/for-next (ef01cc10f319 Merge branch 'features' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/s390/kernel/setup.c
+Merge made by the 'ort' strategy.
+ arch/s390/Kconfig | 28 +----
+ arch/s390/Makefile | 9 --
+ arch/s390/boot/boot.h | 1 -
+ arch/s390/boot/startup.c | 13 +-
+ arch/s390/boot/vmem.c | 20 +--
+ arch/s390/configs/kasan.config | 2 +-
+ arch/s390/include/asm/abs_lowcore.h | 4 +-
+ arch/s390/include/asm/atomic.h | 68 +++++++++-
+ arch/s390/include/asm/atomic_ops.h | 121 ++++++++++++++----
+ arch/s390/include/asm/checksum.h | 2 +-
+ arch/s390/include/asm/css_chars.h | 2 +-
+ arch/s390/include/asm/debug.h | 7 ++
+ arch/s390/include/asm/diag.h | 1 +
+ arch/s390/include/asm/fpu-insn.h | 14 +--
+ arch/s390/include/asm/hugetlb.h | 23 ++--
+ arch/s390/include/asm/page-states.h | 3 +-
+ arch/s390/include/asm/pgtable.h | 126 ++++++++++---------
+ arch/s390/include/asm/preempt.h | 83 +++++--------
+ arch/s390/include/asm/sclp.h | 34 +++++
+ arch/s390/include/uapi/asm/diag.h | 24 ++++
+ arch/s390/kernel/Makefile | 3 +-
+ arch/s390/kernel/abs_lowcore.c | 1 +
+ arch/s390/kernel/debug.c | 241 +++++++++++++++++++++++++++++-------
+ arch/s390/kernel/diag/Makefile | 1 +
+ arch/s390/kernel/{ => diag}/diag.c | 3 +-
+ arch/s390/kernel/diag/diag324.c | 224 +++++++++++++++++++++++++++++++++
+ arch/s390/kernel/diag/diag_ioctl.h | 10 ++
+ arch/s390/kernel/diag/diag_misc.c | 54 ++++++++
+ arch/s390/kernel/entry.S | 20 +--
+ arch/s390/kernel/os_info.c | 1 +
+ arch/s390/kernel/setup.c | 33 ++---
+ arch/s390/kernel/vdso64/Makefile | 2 +-
+ arch/s390/kernel/vmcore_info.c | 3 +-
+ arch/s390/lib/mem.S | 15 +--
+ arch/s390/mm/init.c | 9 ++
+ arch/s390/mm/maccess.c | 1 +
+ arch/s390/mm/mmap.c | 42 ++++---
+ arch/s390/mm/pageattr.c | 6 -
+ arch/s390/mm/pgtable.c | 2 -
+ arch/s390/mm/vmem.c | 8 --
+ arch/s390/pci/Makefile | 2 +-
+ arch/s390/pci/pci_event.c | 21 +++-
+ arch/s390/pci/pci_report.c | 158 +++++++++++++++++++++++
+ arch/s390/pci/pci_report.h | 16 +++
+ drivers/s390/char/sclp.h | 18 +--
+ drivers/s390/char/sclp_early.c | 2 +
+ drivers/s390/char/sclp_pci.c | 19 ---
+ drivers/s390/cio/device_ops.c | 2 +-
+ drivers/s390/cio/qdio.h | 9 +-
+ drivers/s390/cio/qdio_setup.c | 21 ++--
+ 50 files changed, 1121 insertions(+), 411 deletions(-)
+ create mode 100644 arch/s390/include/uapi/asm/diag.h
+ create mode 100644 arch/s390/kernel/diag/Makefile
+ rename arch/s390/kernel/{ => diag}/diag.c (98%)
+ create mode 100644 arch/s390/kernel/diag/diag324.c
+ create mode 100644 arch/s390/kernel/diag/diag_ioctl.h
+ create mode 100644 arch/s390/kernel/diag/diag_misc.c
+ create mode 100644 arch/s390/pci/pci_report.c
+ create mode 100644 arch/s390/pci/pci_report.h
+Merging sh/for-next (63e72e551942 sh: intc: Fix use-after-free bug in register_intc_controller())
+$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next
+Already up to date.
+Merging sparc/for-next (b6370b338e71 sparc/vdso: Add helper function for 64-bit right shift on 32-bit target)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next
+Already up to date.
+Merging uml/next (bed2cc482600 hostfs: Fix the NULL vs IS_ERR() bug for __filemap_get_folio())
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next
+Already up to date.
+Merging xtensa/xtensa-for-next (d14b9a713b34 xtensa/simdisk: Use str_write_read() helper in simdisk_transfer())
+$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next
+Auto-merging arch/xtensa/kernel/setup.c
+Merge made by the 'ort' strategy.
+ arch/xtensa/include/asm/processor.h | 4 +---
+ arch/xtensa/kernel/setup.c | 2 +-
+ arch/xtensa/platforms/iss/simdisk.c | 3 ++-
+ 3 files changed, 4 insertions(+), 5 deletions(-)
+Merging fs-next (8239d77b3fdd Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git)
+ 15858da53542 ("selftests: coredump: Add stackdump test")
+ ab251dacfbae ("fs/proc: do_task_stat: Fix ESP not readable during coredump")
+$ git merge -m Merge branch 'fs-next' of linux-next fs-next
+Auto-merging MAINTAINERS
+Auto-merging fs/bcachefs/util.h
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/exec.c
+Auto-merging fs/f2fs/data.c
+Auto-merging fs/fuse/file.c
+Auto-merging fs/open.c
+Auto-merging include/linux/min_heap.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/seqlock.h
+Auto-merging kernel/fork.c
+Auto-merging lib/kunit_iov_iter.c
+Auto-merging mm/filemap.c
+Auto-merging mm/memory.c
+Auto-merging mm/nommu.c
+Auto-merging mm/readahead.c
+Auto-merging mm/shmem.c
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/bcachefs/CodingStyle.rst | 2 +-
+ Documentation/filesystems/fiemap.rst | 45 +-
+ Documentation/security/credentials.rst | 5 -
+ Documentation/sunrpc/xdr/nfs4_1.x | 186 ++++
+ MAINTAINERS | 7 +
+ drivers/crypto/ccp/sev-dev.c | 2 +-
+ fs/9p/vfs_addr.c | 6 +-
+ fs/afs/Makefile | 1 +
+ fs/afs/callback.c | 4 +-
+ fs/afs/dir.c | 841 ++++++++--------
+ fs/afs/dir_edit.c | 385 +++++---
+ fs/afs/dir_search.c | 227 +++++
+ fs/afs/file.c | 258 ++---
+ fs/afs/fs_operation.c | 113 ++-
+ fs/afs/fsclient.c | 62 +-
+ fs/afs/inode.c | 140 ++-
+ fs/afs/internal.h | 143 ++-
+ fs/afs/main.c | 2 +-
+ fs/afs/mntpt.c | 22 +-
+ fs/afs/rotate.c | 4 +-
+ fs/afs/rxrpc.c | 37 +-
+ fs/afs/super.c | 4 +-
+ fs/afs/validation.c | 31 +-
+ fs/afs/vlclient.c | 1 +
+ fs/afs/write.c | 16 +-
+ fs/afs/xdr_fs.h | 2 +-
+ fs/afs/yfsclient.c | 49 +-
+ fs/backing-file.c | 20 +-
+ fs/bcachefs/Kconfig | 2 +-
+ fs/bcachefs/Makefile | 1 +
+ fs/bcachefs/acl.c | 11 +-
+ fs/bcachefs/alloc_background.c | 558 +++++------
+ fs/bcachefs/alloc_background.h | 18 +-
+ fs/bcachefs/alloc_background_format.h | 4 +-
+ fs/bcachefs/alloc_foreground.c | 304 +++---
+ fs/bcachefs/alloc_foreground.h | 4 +-
+ fs/bcachefs/backpointers.c | 840 +++++++++-------
+ fs/bcachefs/backpointers.h | 97 +-
+ fs/bcachefs/bbpos.h | 2 +-
+ fs/bcachefs/bcachefs.h | 70 +-
+ fs/bcachefs/bcachefs_format.h | 105 +-
+ fs/bcachefs/bkey.h | 7 -
+ fs/bcachefs/bkey_methods.c | 29 +-
+ fs/bcachefs/bkey_methods.h | 15 +-
+ fs/bcachefs/bkey_types.h | 28 +
+ fs/bcachefs/btree_cache.c | 59 +-
+ fs/bcachefs/btree_cache.h | 14 +-
+ fs/bcachefs/btree_gc.c | 178 +---
+ fs/bcachefs/btree_gc.h | 4 +-
+ fs/bcachefs/btree_io.c | 217 +++--
+ fs/bcachefs/btree_io.h | 6 +-
+ fs/bcachefs/btree_iter.c | 608 +++++++-----
+ fs/bcachefs/btree_iter.h | 134 ++-
+ fs/bcachefs/btree_journal_iter.c | 237 ++++-
+ fs/bcachefs/btree_journal_iter.h | 22 +-
+ fs/bcachefs/btree_journal_iter_types.h | 36 +
+ fs/bcachefs/btree_key_cache.c | 75 +-
+ fs/bcachefs/btree_locking.c | 16 +-
+ fs/bcachefs/btree_locking.h | 50 +-
+ fs/bcachefs/btree_node_scan.c | 153 ++-
+ fs/bcachefs/btree_node_scan_types.h | 1 -
+ fs/bcachefs/btree_trans_commit.c | 213 ++--
+ fs/bcachefs/btree_types.h | 62 +-
+ fs/bcachefs/btree_update.c | 74 +-
+ fs/bcachefs/btree_update.h | 29 +-
+ fs/bcachefs/btree_update_interior.c | 295 +++---
+ fs/bcachefs/btree_update_interior.h | 3 +-
+ fs/bcachefs/btree_write_buffer.c | 83 +-
+ fs/bcachefs/buckets.c | 133 +--
+ fs/bcachefs/buckets.h | 30 +-
+ fs/bcachefs/buckets_types.h | 2 +-
+ fs/bcachefs/chardev.c | 219 +----
+ fs/bcachefs/checksum.c | 10 +-
+ fs/bcachefs/checksum.h | 2 +-
+ fs/bcachefs/compress.c | 96 +-
+ fs/bcachefs/darray.h | 2 +-
+ fs/bcachefs/data_update.c | 76 +-
+ fs/bcachefs/debug.c | 4 +-
+ fs/bcachefs/dirent.c | 10 +-
+ fs/bcachefs/dirent.h | 4 +-
+ fs/bcachefs/disk_accounting.c | 150 +--
+ fs/bcachefs/disk_accounting.h | 73 +-
+ fs/bcachefs/ec.c | 275 +++---
+ fs/bcachefs/ec.h | 5 +-
+ fs/bcachefs/errcode.h | 21 +-
+ fs/bcachefs/error.c | 187 ++--
+ fs/bcachefs/error.h | 58 +-
+ fs/bcachefs/extent_update.c | 4 +-
+ fs/bcachefs/extents.c | 290 ++----
+ fs/bcachefs/extents.h | 18 +-
+ fs/bcachefs/extents_format.h | 15 +-
+ fs/bcachefs/fs-common.c | 108 ++-
+ fs/bcachefs/fs-common.h | 2 +
+ fs/bcachefs/fs-io-buffered.c | 45 +-
+ fs/bcachefs/fs-io-direct.c | 5 +
+ fs/bcachefs/fs-io-pagecache.c | 4 +-
+ fs/bcachefs/fs-io.c | 54 +-
+ fs/bcachefs/fs-ioctl.c | 7 +-
+ fs/bcachefs/fs.c | 88 +-
+ fs/bcachefs/fs.h | 1 +
+ fs/bcachefs/fsck.c | 733 ++++++++------
+ fs/bcachefs/fsck.h | 11 +
+ fs/bcachefs/inode.c | 169 ++--
+ fs/bcachefs/inode.h | 43 +-
+ fs/bcachefs/inode_format.h | 15 +-
+ fs/bcachefs/io_misc.c | 22 +-
+ fs/bcachefs/io_read.c | 246 +++--
+ fs/bcachefs/io_read.h | 28 +-
+ fs/bcachefs/io_write.c | 102 +-
+ fs/bcachefs/journal.c | 162 +++-
+ fs/bcachefs/journal.h | 9 +-
+ fs/bcachefs/journal_io.c | 231 +++--
+ fs/bcachefs/journal_io.h | 2 +-
+ fs/bcachefs/journal_reclaim.c | 19 +-
+ fs/bcachefs/journal_types.h | 5 +
+ fs/bcachefs/logged_ops.c | 11 +-
+ fs/bcachefs/logged_ops_format.h | 5 +
+ fs/bcachefs/lru.c | 4 +-
+ fs/bcachefs/lru.h | 2 +-
+ fs/bcachefs/move.c | 184 ++--
+ fs/bcachefs/move.h | 5 +-
+ fs/bcachefs/movinggc.c | 6 +-
+ fs/bcachefs/opts.c | 26 +-
+ fs/bcachefs/opts.h | 61 +-
+ fs/bcachefs/printbuf.h | 15 +-
+ fs/bcachefs/quota.c | 2 +-
+ fs/bcachefs/quota.h | 4 +-
+ fs/bcachefs/rcu_pending.c | 38 +-
+ fs/bcachefs/rebalance.c | 266 ++++-
+ fs/bcachefs/rebalance.h | 10 +
+ fs/bcachefs/rebalance_format.h | 53 +
+ fs/bcachefs/rebalance_types.h | 2 -
+ fs/bcachefs/recovery.c | 218 +++--
+ fs/bcachefs/recovery.h | 2 +-
+ fs/bcachefs/recovery_passes.c | 108 ++-
+ fs/bcachefs/recovery_passes.h | 1 +
+ fs/bcachefs/recovery_passes_types.h | 92 +-
+ fs/bcachefs/reflink.c | 498 +++++++---
+ fs/bcachefs/reflink.h | 20 +-
+ fs/bcachefs/reflink_format.h | 7 +-
+ fs/bcachefs/sb-clean.c | 6 +-
+ fs/bcachefs/sb-counters_format.h | 165 ++--
+ fs/bcachefs/sb-downgrade.c | 25 +-
+ fs/bcachefs/sb-errors_format.h | 53 +-
+ fs/bcachefs/six.c | 17 +-
+ fs/bcachefs/six.h | 1 +
+ fs/bcachefs/snapshot.c | 529 +++++-----
+ fs/bcachefs/snapshot.h | 17 +-
+ fs/bcachefs/str_hash.c | 286 ++++++
+ fs/bcachefs/str_hash.h | 28 +-
+ fs/bcachefs/subvolume.c | 68 +-
+ fs/bcachefs/subvolume.h | 19 +-
+ fs/bcachefs/subvolume_types.h | 2 +-
+ fs/bcachefs/super-io.c | 83 +-
+ fs/bcachefs/super-io.h | 21 +-
+ fs/bcachefs/super.c | 54 +-
+ fs/bcachefs/super.h | 10 -
+ fs/bcachefs/sysfs.c | 60 +-
+ fs/bcachefs/tests.c | 26 +-
+ fs/bcachefs/trace.h | 77 +-
+ fs/bcachefs/util.h | 32 +
+ fs/bcachefs/varint.c | 5 +-
+ fs/bcachefs/xattr.c | 13 +-
+ fs/bcachefs/xattr.h | 5 +-
+ fs/binfmt_elf.c | 4 +-
+ fs/binfmt_elf_fdpic.c | 4 +-
+ fs/btrfs/Kconfig | 1 +
+ fs/btrfs/Makefile | 2 +-
+ fs/btrfs/backref.c | 172 ++--
+ fs/btrfs/backref.h | 16 +-
+ fs/btrfs/bio.c | 11 +-
+ fs/btrfs/block-group.c | 62 +-
+ fs/btrfs/block-rsv.c | 10 +-
+ fs/btrfs/btrfs_inode.h | 2 +-
+ fs/btrfs/ctree.c | 67 --
+ fs/btrfs/ctree.h | 29 -
+ fs/btrfs/delalloc-space.c | 2 +-
+ fs/btrfs/delayed-inode.c | 43 +-
+ fs/btrfs/delayed-ref.c | 89 +-
+ fs/btrfs/delayed-ref.h | 1 +
+ fs/btrfs/direct-io.c | 3 +-
+ fs/btrfs/disk-io.c | 71 ++
+ fs/btrfs/extent-tree.c | 201 ++--
+ fs/btrfs/extent-tree.h | 7 +-
+ fs/btrfs/extent_io.c | 81 +-
+ fs/btrfs/file.c | 95 +-
+ fs/btrfs/free-space-cache.c | 2 +-
+ fs/btrfs/free-space-tree.c | 6 +
+ fs/btrfs/fs.c | 130 +++
+ fs/btrfs/fs.h | 28 +-
+ fs/btrfs/inode.c | 204 ++--
+ fs/btrfs/ioctl.c | 107 +--
+ fs/btrfs/ioctl.h | 1 -
+ fs/btrfs/locking.h | 5 +
+ fs/btrfs/misc.h | 28 +
+ fs/btrfs/ordered-data.c | 63 +-
+ fs/btrfs/ordered-data.h | 9 +
+ fs/btrfs/qgroup.c | 21 +-
+ fs/btrfs/raid-stripe-tree.c | 4 -
+ fs/btrfs/relocation.c | 360 +++----
+ fs/btrfs/scrub.c | 146 +--
+ fs/btrfs/send.c | 3 +-
+ fs/btrfs/space-info.c | 69 +-
+ fs/btrfs/space-info.h | 15 +-
+ fs/btrfs/subpage.c | 48 +-
+ fs/btrfs/super.c | 22 +-
+ fs/btrfs/sysfs.c | 168 +++-
+ fs/btrfs/sysfs.h | 5 +
+ fs/btrfs/tests/btrfs-tests.c | 18 +
+ fs/btrfs/tests/btrfs-tests.h | 6 +
+ fs/btrfs/tests/delayed-refs-tests.c | 1015 ++++++++++++++++++++
+ fs/btrfs/transaction.c | 3 +-
+ fs/btrfs/transaction.h | 18 +-
+ fs/btrfs/tree-checker.c | 94 +-
+ fs/btrfs/tree-checker.h | 7 +-
+ fs/btrfs/volumes.c | 249 +++--
+ fs/btrfs/volumes.h | 23 +-
+ fs/btrfs/zoned.c | 154 ++-
+ fs/btrfs/zoned.h | 7 +
+ fs/cachefiles/io.c | 4 +
+ fs/cachefiles/xattr.c | 9 +-
+ fs/ceph/addr.c | 22 +-
+ fs/dlm/config.c | 2 +-
+ fs/dlm/lock.c | 46 +-
+ fs/dlm/lowcomms.c | 3 +-
+ fs/ecryptfs/crypto.c | 2 +-
+ fs/ecryptfs/ecryptfs_kernel.h | 1 -
+ fs/ecryptfs/keystore.c | 4 +-
+ fs/erofs/erofs_fs.h | 3 +-
+ fs/erofs/super.c | 30 +-
+ fs/erofs/xattr.c | 2 +-
+ fs/exec.c | 8 +-
+ fs/exfat/dir.c | 3 +-
+ fs/exfat/fatent.c | 10 +
+ fs/exfat/file.c | 6 +
+ fs/exfat/namei.c | 4 +-
+ fs/ext4/file.c | 3 +
+ fs/ext4/inode.c | 3 +-
+ fs/ext4/namei.c | 4 +-
+ fs/ext4/super.c | 3 +
+ fs/f2fs/compress.c | 28 +-
+ fs/f2fs/data.c | 55 +-
+ fs/f2fs/f2fs.h | 7 +-
+ fs/f2fs/gc.c | 11 +-
+ fs/f2fs/inline.c | 2 +-
+ fs/f2fs/node.c | 1 +
+ fs/fcntl.c | 4 +-
+ fs/fhandle.c | 115 ++-
+ fs/file.c | 22 +-
+ fs/file_table.c | 7 +-
+ fs/fs_context.c | 2 +-
+ fs/fs_parser.c | 3 +-
+ fs/fuse/file.c | 31 +-
+ fs/gfs2/quota.h | 4 +-
+ fs/isofs/compress.c | 12 +-
+ fs/libfs.c | 163 ++--
+ fs/lockd/svc.c | 8 -
+ fs/mount.h | 46 +-
+ fs/namei.c | 34 +-
+ fs/namespace.c | 224 +++--
+ fs/netfs/Makefile | 5 +-
+ fs/netfs/buffered_read.c | 288 +++---
+ fs/netfs/direct_read.c | 78 +-
+ fs/netfs/direct_write.c | 10 +-
+ fs/netfs/internal.h | 41 +-
+ fs/netfs/main.c | 6 +-
+ fs/netfs/misc.c | 154 ++-
+ fs/netfs/objects.c | 21 +-
+ fs/netfs/read_collect.c | 761 +++++++++------
+ fs/netfs/read_pgpriv2.c | 207 ++--
+ fs/netfs/read_retry.c | 211 ++--
+ fs/netfs/read_single.c | 195 ++++
+ fs/netfs/rolling_buffer.c | 226 +++++
+ fs/netfs/stats.c | 4 +-
+ fs/netfs/write_collect.c | 281 +-----
+ fs/netfs/write_issue.c | 241 ++++-
+ fs/netfs/write_retry.c | 232 +++++
+ fs/nfs/callback.c | 4 -
+ fs/nfs/callback_xdr.c | 1 +
+ fs/nfs/fscache.c | 6 +-
+ fs/nfs/fscache.h | 3 +-
+ fs/nfsd/Makefile | 16 +-
+ fs/nfsd/auth.c | 3 +-
+ fs/nfsd/export.c | 25 +-
+ fs/nfsd/filecache.c | 2 +-
+ fs/nfsd/netns.h | 6 -
+ fs/nfsd/nfs4callback.c | 60 +-
+ fs/nfsd/nfs4proc.c | 31 +-
+ fs/nfsd/nfs4recover.c | 4 +-
+ fs/nfsd/nfs4state.c | 526 +++++++---
+ fs/nfsd/nfs4xdr.c | 126 ++-
+ fs/nfsd/nfs4xdr_gen.c | 256 +++++
+ fs/nfsd/nfs4xdr_gen.h | 25 +
+ fs/nfsd/nfsctl.c | 42 -
+ fs/nfsd/nfsd.h | 13 +-
+ fs/nfsd/nfsfh.c | 3 +-
+ fs/nfsd/nfssvc.c | 37 -
+ fs/nfsd/state.h | 36 +-
+ fs/nfsd/trace.h | 1 -
+ fs/nfsd/xdr4.h | 2 -
+ fs/nfsd/xdr4cb.h | 10 +-
+ fs/notify/fanotify/fanotify.c | 31 +-
+ fs/notify/fanotify/fanotify.h | 15 +
+ fs/notify/fanotify/fanotify_user.c | 150 ++-
+ fs/notify/fsnotify.c | 83 +-
+ fs/notify/inotify/inotify_fsnotify.c | 2 +-
+ fs/nsfs.c | 5 +-
+ fs/ntfs3/attrib.c | 15 +-
+ fs/ntfs3/dir.c | 2 +-
+ fs/ntfs3/frecord.c | 74 +-
+ fs/ntfs3/fsntfs.c | 6 +-
+ fs/ntfs3/index.c | 6 +-
+ fs/ntfs3/inode.c | 3 +
+ fs/ntfs3/ntfs_fs.h | 21 +-
+ fs/ntfs3/record.c | 79 +-
+ fs/open.c | 73 +-
+ fs/overlayfs/dir.c | 4 +-
+ fs/overlayfs/namei.c | 2 -
+ fs/overlayfs/util.c | 4 +-
+ fs/pidfs.c | 298 +++++-
+ fs/pipe.c | 19 +-
+ fs/pnode.c | 8 +-
+ fs/proc/kcore.c | 81 +-
+ fs/proc/namespaces.c | 2 +-
+ fs/smb/client/cifssmb.c | 12 +-
+ fs/smb/client/file.c | 3 +-
+ fs/smb/client/smb2ops.c | 2 +-
+ fs/smb/client/smb2pdu.c | 15 +-
+ fs/smb/server/smb2pdu.c | 3 +
+ fs/smb/server/smb_common.c | 10 +-
+ fs/smb/server/transport_rdma.c | 3 +-
+ fs/xfs/xfs_file.c | 13 +
+ fs/xfs/xfs_super.c | 2 +-
+ include/linux/cred.h | 43 +-
+ include/linux/exportfs.h | 20 +
+ include/linux/fanotify.h | 18 +-
+ include/linux/fiemap.h | 16 +-
+ include/linux/folio_queue.h | 12 +-
+ include/linux/fs.h | 102 +-
+ include/linux/fs_parser.h | 2 +
+ include/linux/fsnotify.h | 78 +-
+ include/linux/fsnotify_backend.h | 53 +-
+ include/linux/min_heap.h | 4 +-
+ include/linux/mm.h | 1 +
+ include/linux/mount.h | 5 +-
+ include/linux/netfs.h | 54 +-
+ include/linux/nfs4.h | 9 +-
+ include/linux/nfs_xdr.h | 5 -
+ include/linux/pid.h | 5 +-
+ include/linux/pid_namespace.h | 10 +-
+ include/linux/pidfs.h | 3 +
+ include/linux/pseudo_fs.h | 1 +
+ include/linux/rbtree.h | 37 +
+ include/linux/rculist.h | 44 +
+ include/linux/rolling_buffer.h | 61 ++
+ include/linux/seqlock.h | 2 +-
+ include/linux/sunrpc/cache.h | 2 +
+ include/linux/sunrpc/svc.h | 13 +-
+ include/linux/sunrpc/svc_xprt.h | 22 +
+ include/linux/sunrpc/xdrgen/nfs4_1.h | 153 +++
+ include/linux/time64.h | 5 +
+ include/trace/events/afs.h | 210 +++-
+ include/trace/events/btrfs.h | 3 +-
+ include/trace/events/cachefiles.h | 185 ++--
+ include/trace/events/f2fs.h | 39 +-
+ include/trace/events/netfs.h | 229 +++--
+ include/uapi/asm-generic/fcntl.h | 1 -
+ include/uapi/linux/fanotify.h | 18 +
+ include/uapi/linux/fiemap.h | 47 +-
+ include/uapi/linux/fs.h | 6 +-
+ include/uapi/linux/nfs4.h | 7 +-
+ kernel/cred.c | 50 -
+ kernel/fork.c | 12 +-
+ kernel/pid.c | 139 ++-
+ kernel/pid_namespace.c | 43 +-
+ kernel/sysctl.c | 9 -
+ kernel/trace/pid_list.c | 2 +-
+ kernel/trace/trace.h | 2 -
+ kernel/trace/trace_sched_switch.c | 2 +-
+ kernel/watch_queue.c | 4 +-
+ lib/kunit_iov_iter.c | 4 +-
+ mm/filemap.c | 86 ++
+ mm/memory.c | 19 +
+ mm/nommu.c | 7 +
+ mm/readahead.c | 14 +
+ mm/shmem.c | 10 +-
+ net/sunrpc/cache.c | 53 +-
+ net/sunrpc/svc_xprt.c | 38 +-
+ samples/vfs/.gitignore | 2 +
+ samples/vfs/Makefile | 2 +-
+ samples/vfs/mountinfo.c | 274 ++++++
+ samples/vfs/test-list-all-mounts.c | 235 +++++
+ security/apparmor/apparmorfs.c | 2 +-
+ security/selinux/hooks.c | 3 +-
+ .../selftests/{ => filesystems}/nsfs/.gitignore | 1 +
+ .../selftests/{ => filesystems}/nsfs/Makefile | 4 +-
+ .../selftests/{ => filesystems}/nsfs/config | 0
+ .../selftests/filesystems/nsfs/iterate_mntns.c | 149 +++
+ .../selftests/{ => filesystems}/nsfs/owner.c | 0
+ .../selftests/{ => filesystems}/nsfs/pidns.c | 0
+ .../selftests/filesystems/statmount/Makefile | 2 +-
+ .../filesystems/statmount/listmount_test.c | 66 ++
+ tools/testing/selftests/pid_namespace/.gitignore | 1 +
+ tools/testing/selftests/pid_namespace/Makefile | 2 +-
+ tools/testing/selftests/pid_namespace/pid_max.c | 358 +++++++
+ tools/testing/selftests/pidfd/.gitignore | 2 +
+ tools/testing/selftests/pidfd/Makefile | 3 +-
+ tools/testing/selftests/pidfd/pidfd.h | 40 +-
+ tools/testing/selftests/pidfd/pidfd_bind_mount.c | 188 ++++
+ .../selftests/pidfd/pidfd_file_handle_test.c | 503 ++++++++++
+ tools/testing/selftests/pidfd/pidfd_setns_test.c | 47 +-
+ tools/testing/selftests/pidfd/pidfd_wait.c | 47 +-
+ 412 files changed, 19029 insertions(+), 9444 deletions(-)
+ create mode 100644 Documentation/sunrpc/xdr/nfs4_1.x
+ create mode 100644 fs/afs/dir_search.c
+ create mode 100644 fs/bcachefs/btree_journal_iter_types.h
+ create mode 100644 fs/bcachefs/rebalance_format.h
+ create mode 100644 fs/bcachefs/str_hash.c
+ create mode 100644 fs/btrfs/tests/delayed-refs-tests.c
+ create mode 100644 fs/netfs/read_single.c
+ create mode 100644 fs/netfs/rolling_buffer.c
+ create mode 100644 fs/netfs/write_retry.c
+ create mode 100644 fs/nfsd/nfs4xdr_gen.c
+ create mode 100644 fs/nfsd/nfs4xdr_gen.h
+ create mode 100644 include/linux/rolling_buffer.h
+ create mode 100644 include/linux/sunrpc/xdrgen/nfs4_1.h
+ create mode 100644 samples/vfs/mountinfo.c
+ create mode 100644 samples/vfs/test-list-all-mounts.c
+ rename tools/testing/selftests/{ => filesystems}/nsfs/.gitignore (78%)
+ rename tools/testing/selftests/{ => filesystems}/nsfs/Makefile (50%)
+ rename tools/testing/selftests/{ => filesystems}/nsfs/config (100%)
+ create mode 100644 tools/testing/selftests/filesystems/nsfs/iterate_mntns.c
+ rename tools/testing/selftests/{ => filesystems}/nsfs/owner.c (100%)
+ rename tools/testing/selftests/{ => filesystems}/nsfs/pidns.c (100%)
+ create mode 100644 tools/testing/selftests/filesystems/statmount/listmount_test.c
+ create mode 100644 tools/testing/selftests/pid_namespace/pid_max.c
+ create mode 100644 tools/testing/selftests/pidfd/pidfd_bind_mount.c
+ create mode 100644 tools/testing/selftests/pidfd/pidfd_file_handle_test.c
+Merging printk/for-next (9022df7f5e05 Merge branch 'for-6.14-cpu_sync-fixup' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next
+Merge made by the 'ort' strategy.
+ kernel/printk/internal.h | 6 ++++++
+ kernel/printk/printk.c | 7 ++++++-
+ kernel/printk/printk_safe.c | 16 ++++++----------
+ 3 files changed, 18 insertions(+), 11 deletions(-)
+Merging pci/next (95227799c87f Merge branch 'pci/misc')
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next
+Auto-merging MAINTAINERS
+Auto-merging drivers/clk/clk-en7523.c
+Auto-merging drivers/pci/msi/msi.c
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/vfio/pci/vfio_pci_core.c
+Merge made by the 'ort' strategy.
+ .../bindings/pci/layerscape-pcie-gen4.txt | 52 -----
+ .../devicetree/bindings/pci/mbvl,gpex40-pcie.yaml | 173 ++++++++++++++++
+ .../devicetree/bindings/pci/mobiveil-pcie.txt | 72 -------
+ .../devicetree/bindings/pci/xilinx-versal-cpm.yaml | 1 +
+ MAINTAINERS | 3 +-
+ drivers/ata/ahci.c | 2 +-
+ drivers/ata/ata_piix.c | 2 +-
+ drivers/ata/pata_rdc.c | 2 +-
+ drivers/ata/sata_sil24.c | 2 +-
+ drivers/ata/sata_sis.c | 2 +-
+ drivers/ata/sata_uli.c | 2 +-
+ drivers/ata/sata_vsc.c | 2 +-
+ drivers/clk/clk-en7523.c | 1 -
+ drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 4 +-
+ drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 2 +-
+ drivers/misc/cardreader/rtsx_pcr.c | 2 +-
+ drivers/misc/pci_endpoint_test.c | 107 ++++++++++
+ drivers/misc/tifm_7xx1.c | 6 +-
+ drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 2 +-
+ drivers/ntb/hw/amd/ntb_hw_amd.c | 4 +-
+ drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +-
+ drivers/pci/controller/dwc/pcie-artpec6.c | 13 ++
+ drivers/pci/controller/dwc/pcie-designware-ep.c | 54 +++--
+ drivers/pci/controller/dwc/pcie-designware.c | 5 +-
+ drivers/pci/controller/dwc/pcie-designware.h | 2 +-
+ drivers/pci/controller/dwc/pcie-dw-rockchip.c | 62 +++++-
+ drivers/pci/controller/pcie-mediatek-gen3.c | 125 ++++++++----
+ drivers/pci/controller/pcie-rockchip-ep.c | 4 +
+ drivers/pci/controller/pcie-rockchip.c | 222 ++++-----------------
+ drivers/pci/controller/pcie-rockchip.h | 35 ++--
+ drivers/pci/controller/pcie-xilinx-cpm.c | 50 ++++-
+ drivers/pci/devres.c | 40 +---
+ drivers/pci/endpoint/functions/pci-epf-test.c | 19 ++
+ drivers/pci/endpoint/pci-epc-core.c | 37 ++--
+ drivers/pci/endpoint/pci-epf-core.c | 1 +
+ drivers/pci/hotplug/acpiphp_ibm.c | 6 +-
+ drivers/pci/msi/api.c | 2 +-
+ drivers/pci/msi/msi.c | 2 +-
+ drivers/pci/p2pdma.c | 6 +-
+ drivers/pci/pci-sysfs.c | 42 ++--
+ drivers/pci/pci.c | 99 +++++----
+ drivers/pci/pcie/aspm.c | 35 +++-
+ drivers/pci/vpd.c | 14 +-
+ drivers/vfio/pci/vfio_pci_core.c | 2 +-
+ drivers/vfio/pci/vfio_pci_intrs.c | 10 +-
+ drivers/xen/xen-pciback/conf_space_header.c | 2 +-
+ include/linux/pci-epf.h | 4 +-
+ include/linux/pci.h | 2 +
+ include/uapi/linux/pci_regs.h | 2 +-
+ include/uapi/linux/pcitest.h | 1 +
+ tools/pci/pcitest.c | 16 +-
+ tools/pci/pcitest.sh | 1 +
+ 52 files changed, 806 insertions(+), 554 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt
+ create mode 100644 Documentation/devicetree/bindings/pci/mbvl,gpex40-pcie.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
+Merging pstore/for-next/pstore (9852d85ec9d4 Linux 6.12-rc1)
+$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore
+Already up to date.
+Merging hid/for-next (2f18ba6583d1 Merge branch 'for-6.13/upstream-fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next
+Merge made by the 'ort' strategy.
+ drivers/hid/hid-core.c | 27 +++++++-----------
+ drivers/hid/hid-ids.h | 3 +-
+ drivers/hid/hid-multitouch.c | 6 +---
+ drivers/hid/hid-roccat-arvo.c | 20 +++++++-------
+ drivers/hid/hid-roccat-common.h | 22 +++++++--------
+ drivers/hid/hid-roccat-isku.c | 22 +++++++--------
+ drivers/hid/hid-roccat-kone.c | 22 +++++++--------
+ drivers/hid/hid-roccat-koneplus.c | 42 ++++++++++++++--------------
+ drivers/hid/hid-roccat-konepure.c | 4 +--
+ drivers/hid/hid-roccat-kovaplus.c | 38 +++++++++++++-------------
+ drivers/hid/hid-roccat-lua.c | 10 +++----
+ drivers/hid/hid-roccat-pyra.c | 50 +++++++++++++++++-----------------
+ drivers/hid/hid-roccat-ryos.c | 4 +--
+ drivers/hid/hid-roccat-savu.c | 4 +--
+ drivers/hid/i2c-hid/i2c-hid-core.c | 12 +++++++-
+ drivers/hid/wacom_sys.c | 24 ++++++++--------
+ tools/testing/selftests/hid/.gitignore | 1 +
+ 17 files changed, 157 insertions(+), 154 deletions(-)
+Merging i2c/i2c/for-next (3cfe39b3a845 i2c: Replace list-based mechanism for handling userspace-created clients)
+$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next
+Merge made by the 'ort' strategy.
+ drivers/i2c/i2c-core-base.c | 113 +++++++++++++++-----------------------------
+ include/linux/i2c.h | 10 +---
+ sound/ppc/keywest.c | 7 +--
+ 3 files changed, 41 insertions(+), 89 deletions(-)
+Merging i2c-host/i2c/i2c-host (5b3114631def i2c: amd756: Fix endianness handling for word data)
+$ git merge -m Merge branch 'i2c/i2c-host' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/i2c/i2c-exynos5.yaml | 1 +
+ .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 2 +
+ .../devicetree/bindings/i2c/renesas,riic.yaml | 5 +-
+ drivers/i2c/busses/Kconfig | 4 +-
+ drivers/i2c/busses/i2c-amd756.c | 5 +-
+ drivers/i2c/busses/i2c-exynos5.c | 35 +-
+ drivers/i2c/busses/i2c-imx-lpi2c.c | 775 ++++++++++++++++++++-
+ drivers/i2c/busses/i2c-imx.c | 99 ++-
+ drivers/i2c/busses/i2c-isch.c | 6 +-
+ drivers/i2c/busses/i2c-keba.c | 8 +-
+ drivers/i2c/busses/i2c-npcm7xx.c | 427 +++++++++---
+ drivers/i2c/busses/i2c-qcom-geni.c | 56 +-
+ drivers/i2c/busses/i2c-xiic.c | 283 ++++++--
+ 13 files changed, 1475 insertions(+), 231 deletions(-)
+Merging i3c/i3c/next (6cf7b65f7029 i3c: Use i3cdev->desc->info instead of calling i3c_device_get_info() to avoid deadlock)
+$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next
+Already up to date.
+Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots)
+$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next
+Already up to date.
+Merging hwmon-staging/hwmon-next (6071d10413ff hwmon: (lm75) add I3C support for P3T1755)
+$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/hwmon/lm75.yaml | 1 +
+ .../devicetree/bindings/trivial-devices.yaml | 2 +
+ Documentation/hwmon/asus_ec_sensors.rst | 1 +
+ Documentation/hwmon/crps.rst | 97 +++++
+ Documentation/hwmon/index.rst | 2 +
+ Documentation/hwmon/isl28022.rst | 3 +-
+ Documentation/hwmon/lm75.rst | 8 +-
+ Documentation/hwmon/nct6683.rst | 23 +-
+ Documentation/hwmon/pmbus-core.rst | 35 ++
+ Documentation/hwmon/tps25990.rst | 147 +++++++
+ MAINTAINERS | 11 +-
+ drivers/hwmon/Kconfig | 2 +
+ drivers/hwmon/asus-ec-sensors.c | 13 +
+ drivers/hwmon/chipcap2.c | 63 +--
+ drivers/hwmon/hwmon.c | 21 +-
+ drivers/hwmon/isl28022.c | 11 +-
+ drivers/hwmon/lm75.c | 339 ++++++++++------
+ drivers/hwmon/nct6683.c | 3 +
+ drivers/hwmon/nct6775-core.c | 6 +-
+ drivers/hwmon/occ/p9_sbe.c | 4 +-
+ drivers/hwmon/pmbus/Kconfig | 26 ++
+ drivers/hwmon/pmbus/Makefile | 2 +
+ drivers/hwmon/pmbus/crps.c | 74 ++++
+ drivers/hwmon/pmbus/pmbus.h | 4 +
+ drivers/hwmon/pmbus/pmbus_core.c | 94 ++++-
+ drivers/hwmon/pmbus/tps25990.c | 436 +++++++++++++++++++++
+ drivers/hwmon/raspberrypi-hwmon.c | 22 ++
+ drivers/hwmon/tmp108.c | 13 +-
+ include/linux/pmbus.h | 14 +
+ include/linux/thermal.h | 4 +
+ 30 files changed, 1260 insertions(+), 221 deletions(-)
+ create mode 100644 Documentation/hwmon/crps.rst
+ create mode 100644 Documentation/hwmon/tps25990.rst
+ create mode 100644 drivers/hwmon/pmbus/crps.c
+ create mode 100644 drivers/hwmon/pmbus/tps25990.c
+Merging jc_docs/docs-next (9339d3587cff Merge branch 'docs-mw' into docs-next)
+$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
+Auto-merging Documentation/virt/kvm/api.rst
+Auto-merging MAINTAINERS
+Auto-merging lib/Kconfig.debug
+Auto-merging scripts/checkpatch.pl
+CONFLICT (content): Merge conflict in scripts/checkpatch.pl
+Recorded preimage for 'scripts/checkpatch.pl'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'scripts/checkpatch.pl'.
+[master 624856b66a89] Merge branch 'docs-next' of git://git.lwn.net/linux.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/accounting/taskstats-struct.rst | 2 +-
+ Documentation/admin-guide/README.rst | 4 +-
+ Documentation/admin-guide/blockdev/zram.rst | 6 +-
+ Documentation/admin-guide/braille-console.rst | 4 +-
+ Documentation/admin-guide/index.rst | 190 ++++++---
+ Documentation/admin-guide/nvme-multipath.rst | 72 ++++
+ Documentation/admin-guide/sysctl/fs.rst | 2 +-
+ Documentation/admin-guide/sysrq.rst | 20 +-
+ Documentation/arch/x86/boot.rst | 369 ++++++++--------
+ Documentation/core-api/index.rst | 1 +
+ Documentation/core-api/kref.rst | 7 +-
+ Documentation/core-api/parser.rst | 17 +
+ Documentation/dev-tools/index.rst | 5 +-
+ Documentation/filesystems/iomap/operations.rst | 2 +-
+ Documentation/filesystems/overlayfs.rst | 2 +-
+ Documentation/filesystems/porting.rst | 2 +-
+ Documentation/process/5.Posting.rst | 4 +
+ .../driver_development_debugging_guide.rst | 20 +-
+ .../debugging}/gdb-kernel-debugging.rst | 0
+ Documentation/process/debugging/index.rst | 2 +
+ .../{dev-tools => process/debugging}/kgdb.rst | 50 +--
+ Documentation/process/email-clients.rst | 8 +-
+ Documentation/process/maintainer-tip.rst | 2 +-
+ Documentation/process/submitting-patches.rst | 64 +--
+ Documentation/scheduler/sched-deadline.rst | 13 +-
+ Documentation/scheduler/sched-ext.rst | 6 +-
+ Documentation/scheduler/sched-rt-group.rst | 8 +-
+ Documentation/trace/rv/runtime-verification.rst | 4 +-
+ .../translations/it_IT/process/email-clients.rst | 8 +-
+ .../translations/sp_SP/process/3.Early-stage.rst | 234 ++++++++++-
+ .../translations/sp_SP/process/4.Coding.rst | 463 ++++++++++++++++++++-
+ .../translations/sp_SP/process/5.Posting.rst | 388 ++++++++++++++++-
+ .../translations/sp_SP/process/6.Followthrough.rst | 223 +++++++++-
+ .../sp_SP/process/7.AdvancedTopics.rst | 207 ++++++++-
+ .../translations/sp_SP/process/8.Conclusion.rst | 75 +++-
+ .../sp_SP/process/development-process.rst | 21 +-
+ .../translations/sp_SP/process/email-clients.rst | 8 +-
+ Documentation/translations/sp_SP/process/index.rst | 2 +-
+ .../translations/zh_CN/admin-guide/sysrq.rst | 22 +-
+ .../translations/zh_CN/process/email-clients.rst | 8 +-
+ .../translations/zh_CN/security/index.rst | 34 ++
+ Documentation/translations/zh_CN/security/lsm.rst | 95 +++++
+ .../translations/zh_CN/subsystem-apis.rst | 2 +-
+ .../translations/zh_TW/admin-guide/sysrq.rst | 22 +-
+ .../translations/zh_TW/process/email-clients.rst | 8 +-
+ Documentation/virt/kvm/api.rst | 2 +-
+ MAINTAINERS | 2 +-
+ include/linux/kref.h | 48 ++-
+ include/linux/tty_driver.h | 2 +-
+ lib/Kconfig.debug | 2 +-
+ lib/Kconfig.kgdb | 2 +-
+ lib/parser.c | 5 +-
+ scripts/checkpatch.pl | 4 +-
+ scripts/kernel-doc | 2 +-
+ 54 files changed, 2336 insertions(+), 439 deletions(-)
+ create mode 100644 Documentation/admin-guide/nvme-multipath.rst
+ create mode 100644 Documentation/core-api/parser.rst
+ rename Documentation/{dev-tools => process/debugging}/gdb-kernel-debugging.rst (100%)
+ rename Documentation/{dev-tools => process/debugging}/kgdb.rst (96%)
+ create mode 100644 Documentation/translations/zh_CN/security/index.rst
+ create mode 100644 Documentation/translations/zh_CN/security/lsm.rst
+Merging v4l-dvb/next (2762eab6d414 media: uvcvideo: Add Kurokesu C1 PRO camera)
+$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next
+Auto-merging MAINTAINERS
+Auto-merging drivers/media/i2c/ds90ub913.c
+Auto-merging drivers/media/i2c/ds90ub953.c
+Auto-merging drivers/media/i2c/ds90ub960.c
+Auto-merging drivers/media/pci/intel/ipu6/ipu6-buttress.c
+Auto-merging drivers/media/pci/intel/ipu6/ipu6-cpd.c
+Auto-merging drivers/media/pci/intel/ipu6/ipu6-isys.c
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/media/ipu3.rst | 6 +-
+ .../devicetree/bindings/media/i2c/sony,imx290.yaml | 2 +
+ .../bindings/media/qcom,sc7280-camss.yaml | 425 +++++
+ .../bindings/media/qcom,sc8280xp-camss.yaml | 40 +-
+ .../bindings/media/qcom,sdm845-camss.yaml | 20 +-
+ .../bindings/media/qcom,sm8250-camss.yaml | 28 +-
+ .../devicetree/bindings/media/st,stm32-dcmipp.yaml | 53 +-
+ .../bindings/media/st,stm32mp25-csi.yaml | 125 ++
+ .../bindings/media/video-interfaces.yaml | 21 +
+ Documentation/driver-api/media/tx-rx.rst | 9 +-
+ MAINTAINERS | 25 +-
+ drivers/media/common/b2c2/flexcop-common.h | 4 -
+ drivers/media/common/b2c2/flexcop-misc.c | 13 -
+ drivers/media/dvb-frontends/cxd2841er.c | 8 +-
+ drivers/media/i2c/ccs/ccs-core.c | 18 +-
+ drivers/media/i2c/ccs/ccs-data.c | 15 +-
+ drivers/media/i2c/ds90ub913.c | 26 +-
+ drivers/media/i2c/ds90ub953.c | 56 +-
+ drivers/media/i2c/ds90ub960.c | 188 ++-
+ drivers/media/i2c/imx208.c | 2 +-
+ drivers/media/i2c/imx290.c | 81 +-
+ drivers/media/i2c/imx296.c | 2 +
+ drivers/media/i2c/imx412.c | 42 +-
+ drivers/media/i2c/ov2740.c | 58 +-
+ drivers/media/i2c/ov5640.c | 1 +
+ drivers/media/i2c/ov9282.c | 2 +-
+ drivers/media/pci/b2c2/flexcop-dma.c | 17 -
+ drivers/media/pci/cx18/cx18-gpio.c | 15 -
+ drivers/media/pci/cx18/cx18-gpio.h | 1 -
+ drivers/media/pci/intel/ipu6/ipu6-buttress.c | 8 +-
+ drivers/media/pci/intel/ipu6/ipu6-cpd.c | 2 +-
+ drivers/media/pci/intel/ipu6/ipu6-isys.c | 1 +
+ drivers/media/pci/mgb4/mgb4_core.c | 4 +-
+ drivers/media/pci/mgb4/mgb4_core.h | 3 -
+ drivers/media/pci/mgb4/mgb4_sysfs_in.c | 12 +-
+ drivers/media/pci/mgb4/mgb4_vin.c | 20 +-
+ drivers/media/pci/mgb4/mgb4_vin.h | 4 +-
+ drivers/media/pci/mgb4/mgb4_vout.c | 14 +-
+ drivers/media/platform/broadcom/bcm2835-unicam.c | 42 +-
+ drivers/media/platform/marvell/mcam-core.c | 7 +-
+ .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 77 +-
+ .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h | 1 +
+ .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 537 +++----
+ .../media/platform/mediatek/mdp3/mtk-mdp3-comp.h | 29 +-
+ .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 2 +
+ .../media/platform/mediatek/mdp3/mtk-mdp3-core.h | 1 +
+ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 7 +-
+ .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 13 +-
+ drivers/media/platform/qcom/camss/camss-csiphy.c | 5 +
+ drivers/media/platform/qcom/camss/camss-csiphy.h | 7 +
+ drivers/media/platform/qcom/camss/camss-vfe.c | 8 +-
+ drivers/media/platform/qcom/camss/camss.c | 514 +++++-
+ drivers/media/platform/qcom/camss/camss.h | 5 +-
+ drivers/media/platform/renesas/rcar-csi2.c | 91 +-
+ drivers/media/platform/rockchip/rga/rga-buf.c | 2 +-
+ drivers/media/platform/rockchip/rga/rga-hw.c | 2 +-
+ drivers/media/platform/rockchip/rga/rga-hw.h | 2 +-
+ drivers/media/platform/rockchip/rga/rga.c | 2 +-
+ drivers/media/platform/rockchip/rga/rga.h | 2 +-
+ .../platform/rockchip/rkisp1/rkisp1-capture.c | 4 +-
+ .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 3 +
+ .../platform/samsung/exynos4-is/fimc-is-errno.c | 131 --
+ .../platform/samsung/exynos4-is/fimc-is-errno.h | 1 -
+ .../media/platform/samsung/exynos4-is/mipi-csis.c | 10 +-
+ .../media/platform/samsung/s3c-camif/camif-core.c | 13 +-
+ drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 7 +-
+ drivers/media/platform/st/stm32/Kconfig | 14 +
+ drivers/media/platform/st/stm32/Makefile | 1 +
+ drivers/media/platform/st/stm32/stm32-csi.c | 1137 +++++++++++++
+ .../media/platform/st/stm32/stm32-dcmipp/Makefile | 2 +-
+ .../st/stm32/stm32-dcmipp/dcmipp-bytecap.c | 128 +-
+ .../st/stm32/stm32-dcmipp/dcmipp-byteproc.c | 117 +-
+ .../platform/st/stm32/stm32-dcmipp/dcmipp-common.h | 4 +-
+ .../platform/st/stm32/stm32-dcmipp/dcmipp-core.c | 122 +-
+ .../platform/st/stm32/stm32-dcmipp/dcmipp-input.c | 540 +++++++
+ .../st/stm32/stm32-dcmipp/dcmipp-parallel.c | 440 -----
+ drivers/media/platform/verisilicon/hantro.h | 9 +
+ drivers/media/platform/verisilicon/hantro_g2.c | 2 +-
+ .../media/platform/verisilicon/hantro_postproc.c | 32 +-
+ drivers/media/platform/verisilicon/hantro_v4l2.c | 21 +
+ drivers/media/platform/verisilicon/imx8m_vpu_hw.c | 10 +-
+ .../verisilicon/rockchip_vpu981_hw_av1_dec.c | 9 +-
+ drivers/media/radio/Kconfig | 4 -
+ drivers/media/radio/Makefile | 1 -
+ drivers/media/radio/wl128x/Kconfig | 15 -
+ drivers/media/radio/wl128x/Makefile | 7 -
+ drivers/media/radio/wl128x/fmdrv.h | 229 ---
+ drivers/media/radio/wl128x/fmdrv_common.c | 1676 --------------------
+ drivers/media/radio/wl128x/fmdrv_common.h | 389 -----
+ drivers/media/radio/wl128x/fmdrv_rx.c | 820 ----------
+ drivers/media/radio/wl128x/fmdrv_rx.h | 45 -
+ drivers/media/radio/wl128x/fmdrv_tx.c | 413 -----
+ drivers/media/radio/wl128x/fmdrv_tx.h | 24 -
+ drivers/media/radio/wl128x/fmdrv_v4l2.c | 604 -------
+ drivers/media/radio/wl128x/fmdrv_v4l2.h | 20 -
+ drivers/media/rc/iguanair.c | 4 +-
+ drivers/media/rc/imon_raw.c | 2 +-
+ drivers/media/rc/mceusb.c | 5 +-
+ drivers/media/tuners/fc0013.c | 64 -
+ drivers/media/tuners/fc0013.h | 11 -
+ drivers/media/usb/cx231xx/cx231xx-avcore.c | 1 -
+ drivers/media/usb/dvb-usb-v2/lmedm04.c | 12 +-
+ drivers/media/usb/uvc/uvc_ctrl.c | 88 +-
+ drivers/media/usb/uvc/uvc_driver.c | 298 ++--
+ drivers/media/usb/uvc/uvc_queue.c | 9 +-
+ drivers/media/usb/uvc/uvc_status.c | 8 +-
+ drivers/media/usb/uvc/uvc_v4l2.c | 164 +-
+ drivers/media/usb/uvc/uvc_video.c | 59 +-
+ drivers/media/usb/uvc/uvcvideo.h | 15 +-
+ drivers/media/v4l2-core/v4l2-fwnode.c | 43 +-
+ drivers/media/v4l2-core/v4l2-mc.c | 2 +-
+ drivers/soc/mediatek/mtk-cmdq-helper.c | 18 -
+ drivers/staging/media/max96712/max96712.c | 4 +-
+ include/dt-bindings/media/video-interfaces.h | 7 +
+ include/linux/soc/mediatek/mtk-cmdq.h | 13 -
+ include/media/v4l2-mediabus.h | 21 +
+ 116 files changed, 4437 insertions(+), 6142 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/qcom,sc7280-camss.yaml
+ create mode 100644 Documentation/devicetree/bindings/media/st,stm32mp25-csi.yaml
+ create mode 100644 drivers/media/platform/st/stm32/stm32-csi.c
+ create mode 100644 drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-input.c
+ delete mode 100644 drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-parallel.c
+ delete mode 100644 drivers/media/radio/wl128x/Kconfig
+ delete mode 100644 drivers/media/radio/wl128x/Makefile
+ delete mode 100644 drivers/media/radio/wl128x/fmdrv.h
+ delete mode 100644 drivers/media/radio/wl128x/fmdrv_common.c
+ delete mode 100644 drivers/media/radio/wl128x/fmdrv_common.h
+ delete mode 100644 drivers/media/radio/wl128x/fmdrv_rx.c
+ delete mode 100644 drivers/media/radio/wl128x/fmdrv_rx.h
+ delete mode 100644 drivers/media/radio/wl128x/fmdrv_tx.c
+ delete mode 100644 drivers/media/radio/wl128x/fmdrv_tx.h
+ delete mode 100644 drivers/media/radio/wl128x/fmdrv_v4l2.c
+ delete mode 100644 drivers/media/radio/wl128x/fmdrv_v4l2.h
+Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init())
+$ 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 (84dd70b4c33d Merge branch 'thermal-intel' into linux-next)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next
+Merge made by the 'ort' strategy.
+ drivers/acpi/battery.c | 14 +-
+ drivers/acpi/bgrt.c | 6 +-
+ drivers/acpi/dptf/dptf_pch_fivr.c | 1 +
+ drivers/acpi/dptf/dptf_power.c | 2 +
+ drivers/acpi/dptf/int340x_thermal.c | 6 +
+ drivers/acpi/fan.h | 1 +
+ drivers/acpi/fan_core.c | 10 +-
+ drivers/acpi/mipi-disco-img.c | 3 +-
+ drivers/acpi/osl.c | 22 +-
+ drivers/acpi/property.c | 2 +-
+ drivers/acpi/scan.c | 4 +-
+ drivers/acpi/sysfs.c | 8 +-
+ drivers/acpi/utils.c | 7 +-
+ drivers/base/physical_location.c | 4 +-
+ drivers/base/power/main.c | 2 +-
+ drivers/base/power/sysfs.c | 1 -
+ drivers/cpufreq/amd-pstate-trace.h | 52 ++-
+ drivers/cpufreq/amd-pstate-ut.c | 12 +-
+ drivers/cpufreq/amd-pstate.c | 474 ++++++++++-----------
+ drivers/cpufreq/amd-pstate.h | 3 -
+ drivers/cpufreq/cpufreq.c | 2 +-
+ drivers/cpufreq/intel_pstate.c | 60 +--
+ drivers/idle/intel_idle.c | 1 +
+ drivers/media/pci/intel/ipu-bridge.c | 29 +-
+ drivers/powercap/intel_rapl_common.c | 1 +
+ drivers/powercap/powercap_sys.c | 1 +
+ drivers/thermal/intel/Kconfig | 4 +-
+ drivers/thermal/intel/int340x_thermal/Kconfig | 4 +-
+ .../intel/int340x_thermal/int3400_thermal.c | 2 +-
+ .../intel/int340x_thermal/int3403_thermal.c | 1 +
+ .../intel/int340x_thermal/int340x_thermal_zone.c | 1 -
+ .../int340x_thermal/processor_thermal_device.h | 1 +
+ .../int340x_thermal/processor_thermal_device_pci.c | 4 +-
+ drivers/usb/core/usb-acpi.c | 3 +-
+ include/acpi/acpi_bus.h | 23 +-
+ include/linux/acpi.h | 5 +
+ include/linux/energy_model.h | 2 +
+ include/linux/pm_wakeup.h | 17 +
+ kernel/power/autosleep.c | 1 -
+ kernel/power/energy_model.c | 17 +
+ kernel/sched/cpufreq_schedutil.c | 37 +-
+ 41 files changed, 459 insertions(+), 391 deletions(-)
+Merging cpufreq-arm/cpufreq/arm/linux-next (af6cc45af3db cpufreq: sparc: change kzalloc to kcalloc)
+$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next
+Merge made by the 'ort' strategy.
+ .../bindings/cpufreq/airoha,en7581-cpufreq.yaml | 55 +++++++++++++++++++++
+ .../bindings/cpufreq/apple,cluster-cpufreq.yaml | 10 +++-
+ drivers/cpufreq/Kconfig | 2 +-
+ drivers/cpufreq/apple-soc-cpufreq.c | 56 +++++++++++++++++-----
+ drivers/cpufreq/cpufreq-dt-platdev.c | 2 -
+ drivers/cpufreq/qcom-cpufreq-hw.c | 34 +++++++++----
+ drivers/cpufreq/scmi-cpufreq.c | 45 +++++++++++++++++
+ drivers/cpufreq/sparc-us2e-cpufreq.c | 2 +-
+ drivers/cpufreq/sparc-us3-cpufreq.c | 2 +-
+ 9 files changed, 181 insertions(+), 27 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/cpufreq/airoha,en7581-cpufreq.yaml
+Merging cpupower/cpupower (8d097444982d pm: cpupower: Add header changes for cpufreq.h to SWIG bindings)
+$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower
+Merge made by the 'ort' strategy.
+ tools/power/cpupower/Makefile | 8 +++++
+ tools/power/cpupower/bindings/python/Makefile | 10 ++++++
+ tools/power/cpupower/bindings/python/README | 25 +++++++++++++++
+ .../cpupower/bindings/python/raw_pylibcpupower.swg | 3 ++
+ tools/power/cpupower/lib/cpufreq.c | 18 +++++++++++
+ tools/power/cpupower/lib/cpufreq.h | 8 +++++
+ tools/power/cpupower/utils/cpufreq-info.c | 36 ++++++++++++++++++++--
+ tools/power/cpupower/utils/helpers/amd.c | 18 ++++++++---
+ .../cpupower/utils/idle_monitor/hsw_ext_idle.c | 4 +--
+ .../cpupower/utils/idle_monitor/mperf_monitor.c | 17 +++++-----
+ tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 2 +-
+ tools/power/cpupower/utils/idle_monitor/snb_idle.c | 4 +--
+ tools/testing/selftests/cpufreq/.gitignore | 2 ++
+ tools/testing/selftests/cpufreq/Makefile | 1 +
+ 14 files changed, 137 insertions(+), 19 deletions(-)
+ create mode 100644 tools/testing/selftests/cpufreq/.gitignore
+Merging devfreq/devfreq-next (1f8ac4b95fee PM / devfreq: Switch back to struct platform_driver::remove())
+$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next
+Auto-merging drivers/devfreq/event/exynos-nocp.c
+CONFLICT (content): Merge conflict in drivers/devfreq/event/exynos-nocp.c
+Auto-merging drivers/devfreq/event/exynos-ppmu.c
+CONFLICT (content): Merge conflict in drivers/devfreq/event/exynos-ppmu.c
+Auto-merging drivers/devfreq/mtk-cci-devfreq.c
+CONFLICT (content): Merge conflict in drivers/devfreq/mtk-cci-devfreq.c
+Auto-merging drivers/devfreq/rk3399_dmc.c
+CONFLICT (content): Merge conflict in drivers/devfreq/rk3399_dmc.c
+Auto-merging drivers/devfreq/sun8i-a33-mbus.c
+CONFLICT (content): Merge conflict in drivers/devfreq/sun8i-a33-mbus.c
+Resolved 'drivers/devfreq/event/exynos-nocp.c' using previous resolution.
+Resolved 'drivers/devfreq/event/exynos-ppmu.c' using previous resolution.
+Resolved 'drivers/devfreq/mtk-cci-devfreq.c' using previous resolution.
+Resolved 'drivers/devfreq/rk3399_dmc.c' using previous resolution.
+Resolved 'drivers/devfreq/sun8i-a33-mbus.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master d9a341b22d26] Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
+$ git diff -M --stat --summary HEAD^..
+ drivers/devfreq/devfreq-event.c | 8 ++------
+ drivers/devfreq/event/exynos-nocp.c | 4 ++--
+ drivers/devfreq/event/exynos-ppmu.c | 4 ++--
+ drivers/devfreq/mtk-cci-devfreq.c | 2 +-
+ drivers/devfreq/rk3399_dmc.c | 6 +++---
+ drivers/devfreq/sun8i-a33-mbus.c | 2 +-
+ 6 files changed, 11 insertions(+), 15 deletions(-)
+Merging pmdomain/next (094041b17654 pmdomain: Merge branch fixes into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next
+Merge made by the 'ort' strategy.
+ .../bindings/power/domain-idle-state.yaml | 5 ++
+ drivers/cpuidle/cpuidle-psci-domain.c | 1 +
+ drivers/pmdomain/core.c | 15 +++-
+ drivers/pmdomain/imx/gpcv2.c | 2 +
+ drivers/pmdomain/imx/imx8m-blk-ctrl.c | 1 +
+ drivers/pmdomain/imx/imx8mp-blk-ctrl.c | 1 +
+ drivers/pmdomain/ti/ti_sci_pm_domains.c | 81 ++++++++++++++++++++++
+ include/linux/pm_domain.h | 1 +
+ 8 files changed, 104 insertions(+), 3 deletions(-)
+Merging opp/opp/linux-next (b44b9bc7cab2 OPP: fix dev_pm_opp_find_bw_*() when bandwidth table not initialized)
+$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next
+Merge made by the 'ort' strategy.
+ drivers/opp/core.c | 82 +++++++++++++++++++++++++++++++++++++++-----------
+ include/linux/pm_opp.h | 7 +++++
+ 2 files changed, 72 insertions(+), 17 deletions(-)
+Merging thermal/thermal/linux-next (7d8abc5f3b5c thermal/drivers/imx_sc_thermal: Use dev_err_probe)
+$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next
+Already up to date.
+Merging rdma/for-next (220043b06fde RDMA/mlx5: Fix link status down event for MPV)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next
+Auto-merging drivers/infiniband/hw/bnxt_re/ib_verbs.c
+Auto-merging drivers/infiniband/hw/bnxt_re/main.c
+Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+Auto-merging drivers/infiniband/hw/mlx5/main.c
+Auto-merging drivers/infiniband/sw/rxe/rxe_net.c
+CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe_net.c
+Auto-merging drivers/infiniband/sw/rxe/rxe_verbs.c
+Auto-merging drivers/infiniband/sw/siw/siw.h
+Auto-merging drivers/infiniband/sw/siw/siw_main.c
+CONFLICT (content): Merge conflict in drivers/infiniband/sw/siw/siw_main.c
+Auto-merging drivers/infiniband/sw/siw/siw_verbs.c
+CONFLICT (content): Merge conflict in drivers/infiniband/sw/siw/siw_verbs.c
+Recorded preimage for 'drivers/infiniband/sw/rxe/rxe_net.c'
+Recorded preimage for 'drivers/infiniband/sw/siw/siw_main.c'
+Recorded preimage for 'drivers/infiniband/sw/siw/siw_verbs.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'drivers/infiniband/sw/rxe/rxe_net.c'.
+Recorded resolution for 'drivers/infiniband/sw/siw/siw_main.c'.
+Recorded resolution for 'drivers/infiniband/sw/siw/siw_verbs.c'.
+[master 548adf678810] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
+$ git diff -M --stat --summary HEAD^..
+ drivers/infiniband/core/cache.c | 35 --
+ drivers/infiniband/core/device.c | 116 +++--
+ drivers/infiniband/core/ud_header.c | 83 ----
+ drivers/infiniband/core/uverbs_marshall.c | 42 --
+ drivers/infiniband/hw/bnxt_re/hw_counters.c | 9 -
+ drivers/infiniband/hw/bnxt_re/ib_verbs.c | 2 -
+ drivers/infiniband/hw/bnxt_re/main.c | 151 ++-----
+ drivers/infiniband/hw/cxgb4/device.c | 6 +-
+ drivers/infiniband/hw/efa/efa_main.c | 9 +-
+ drivers/infiniband/hw/erdma/Kconfig | 2 +-
+ drivers/infiniband/hw/erdma/erdma.h | 14 +-
+ drivers/infiniband/hw/erdma/erdma_cm.c | 71 +--
+ drivers/infiniband/hw/erdma/erdma_cmdq.c | 26 +-
+ drivers/infiniband/hw/erdma/erdma_cq.c | 65 +++
+ drivers/infiniband/hw/erdma/erdma_eq.c | 6 +-
+ drivers/infiniband/hw/erdma/erdma_hw.h | 135 +++++-
+ drivers/infiniband/hw/erdma/erdma_main.c | 62 ++-
+ drivers/infiniband/hw/erdma/erdma_qp.c | 301 ++++++++++---
+ drivers/infiniband/hw/erdma/erdma_verbs.c | 572 +++++++++++++++++++++----
+ drivers/infiniband/hw/erdma/erdma_verbs.h | 166 +++++--
+ drivers/infiniband/hw/hfi1/hfi.h | 14 -
+ drivers/infiniband/hw/hfi1/intr.c | 31 --
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 13 +
+ drivers/infiniband/hw/irdma/osdep.h | 4 -
+ drivers/infiniband/hw/irdma/protos.h | 4 -
+ drivers/infiniband/hw/irdma/utils.c | 71 ---
+ drivers/infiniband/hw/mlx4/cq.c | 6 +-
+ drivers/infiniband/hw/mlx4/main.c | 66 +--
+ drivers/infiniband/hw/mlx4/mlx4_ib.h | 18 +-
+ drivers/infiniband/hw/mlx4/mr.c | 286 +------------
+ drivers/infiniband/hw/mlx4/qp.c | 12 +-
+ drivers/infiniband/hw/mlx5/main.c | 4 +
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 6 +
+ drivers/infiniband/hw/mlx5/odp.c | 6 +-
+ drivers/infiniband/hw/mlx5/restrack.c | 9 +
+ drivers/infiniband/hw/usnic/usnic_ib_main.c | 73 ++--
+ drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 66 +--
+ drivers/infiniband/sw/rxe/rxe_net.c | 22 +-
+ drivers/infiniband/sw/rxe/rxe_param.h | 2 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +-
+ drivers/infiniband/sw/siw/siw_main.c | 8 -
+ drivers/infiniband/ulp/srp/ib_srp.c | 1 -
+ include/rdma/ib_cache.h | 16 -
+ include/rdma/ib_marshall.h | 3 -
+ include/rdma/ib_pack.h | 3 -
+ include/rdma/ib_verbs.h | 24 +-
+ 46 files changed, 1533 insertions(+), 1114 deletions(-)
+$ git am -3 ../patches/0001-fix-up-for-RDMA-rxe-Remove-deliver-net-device-event.patch
+Applying: fix up for "RDMA/rxe: Remove deliver net device event"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/infiniband/sw/rxe/rxe_verbs.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 1c386a03bd01] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
+ Date: Mon Jan 6 11:12:48 2025 +1100
+Merging net-next/main (3e5908172c05 Merge tag 'ieee802154-for-net-next-2025-01-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main
+Auto-merging MAINTAINERS
+Auto-merging include/linux/pci.h
+Auto-merging scripts/checkpatch.pl
+Merge made by the 'ort' strategy.
+ Documentation/core-api/packing.rst | 118 +-
+ .../bindings/net/microchip,sparx5-switch.yaml | 18 +
+ .../devicetree/bindings/net/nxp,s32-dwmac.yaml | 105 +
+ .../devicetree/bindings/net/snps,dwmac.yaml | 1 +
+ .../devicetree/bindings/net/ti,dp83822.yaml | 27 +
+ Documentation/netlink/genetlink-c.yaml | 3 +
+ Documentation/netlink/genetlink-legacy.yaml | 3 +
+ Documentation/netlink/netlink-raw.yaml | 2 +-
+ Documentation/netlink/specs/ethtool.yaml | 436 +++-
+ Documentation/netlink/specs/rt_link.yaml | 3 +
+ Documentation/netlink/specs/rt_route.yaml | 7 +
+ Documentation/netlink/specs/rt_rule.yaml | 12 +
+ Documentation/networking/bonding.rst | 8 +-
+ Documentation/networking/ethtool-netlink.rst | 82 +-
+ Documentation/networking/ieee802154.rst | 16 +-
+ Documentation/networking/index.rst | 1 +
+ Documentation/networking/ip-sysctl.rst | 14 +
+ .../net_cachelines/netns_ipv4_sysctl.rst | 1 +
+ Documentation/networking/netconsole.rst | 5 +-
+ Documentation/networking/netmem.rst | 79 +
+ Documentation/networking/timestamping.rst | 38 +-
+ Documentation/networking/tls.rst | 36 +
+ Documentation/userspace-api/netlink/c-code-gen.rst | 4 +-
+ MAINTAINERS | 13 +-
+ Makefile | 4 +
+ arch/alpha/include/uapi/asm/socket.h | 2 +
+ arch/mips/include/uapi/asm/socket.h | 2 +
+ arch/parisc/include/uapi/asm/socket.h | 2 +
+ arch/sparc/include/uapi/asm/socket.h | 2 +
+ drivers/infiniband/hw/mlx5/fs.c | 37 +-
+ drivers/isdn/mISDN/core.c | 14 -
+ drivers/isdn/mISDN/core.h | 1 -
+ drivers/net/bareudp.c | 16 +-
+ drivers/net/can/sja1000/sja1000_platform.c | 15 +-
+ drivers/net/dsa/b53/b53_common.c | 13 +-
+ drivers/net/dsa/b53/b53_priv.h | 1 +
+ drivers/net/dsa/bcm_sf2.c | 1 +
+ drivers/net/dsa/microchip/ksz9477_i2c.c | 4 +
+ drivers/net/dsa/microchip/ksz_common.c | 103 +-
+ drivers/net/dsa/microchip/ksz_common.h | 3 +
+ drivers/net/dsa/microchip/ksz_spi.c | 4 +
+ drivers/net/dsa/mt7530.c | 1 +
+ drivers/net/dsa/mv88e6xxx/chip.c | 50 +-
+ drivers/net/dsa/mv88e6xxx/chip.h | 1 +
+ drivers/net/dsa/qca/qca8k-8xxx.c | 5 +-
+ drivers/net/dsa/qca/qca8k.h | 2 +-
+ drivers/net/dsa/sja1105/sja1105_static_config.c | 8 +-
+ drivers/net/ethernet/Kconfig | 2 +-
+ drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 16 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 71 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 13 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 44 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 2 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 2 +
+ drivers/net/ethernet/cadence/macb_main.c | 14 +-
+ drivers/net/ethernet/freescale/Kconfig | 3 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
+ .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 3 +-
+ drivers/net/ethernet/freescale/enetc/enetc.c | 330 ++-
+ drivers/net/ethernet/freescale/enetc/enetc.h | 29 +-
+ drivers/net/ethernet/freescale/enetc/enetc4_hw.h | 23 +
+ drivers/net/ethernet/freescale/enetc/enetc_hw.h | 31 +-
+ .../net/ethernet/freescale/enetc/enetc_pf_common.c | 13 +-
+ drivers/net/ethernet/freescale/enetc/enetc_vf.c | 7 +-
+ drivers/net/ethernet/freescale/fec.h | 2 -
+ drivers/net/ethernet/freescale/fec_main.c | 16 +-
+ drivers/net/ethernet/freescale/fman/fman.c | 35 +-
+ drivers/net/ethernet/freescale/ucc_geth.c | 600 ++---
+ drivers/net/ethernet/freescale/ucc_geth.h | 22 +-
+ drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 76 +-
+ drivers/net/ethernet/google/gve/gve_adminq.c | 14 -
+ drivers/net/ethernet/google/gve/gve_adminq.h | 1 -
+ drivers/net/ethernet/google/gve/gve_tx_dqo.c | 6 +-
+ drivers/net/ethernet/hisilicon/hibmcge/Makefile | 3 +-
+ .../net/ethernet/hisilicon/hibmcge/hbg_common.h | 29 +
+ .../net/ethernet/hisilicon/hibmcge/hbg_debugfs.c | 160 ++
+ .../net/ethernet/hisilicon/hibmcge/hbg_debugfs.h | 12 +
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_err.c | 134 +
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_err.h | 13 +
+ .../net/ethernet/hisilicon/hibmcge/hbg_ethtool.c | 181 ++
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_hw.c | 48 +-
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_hw.h | 6 +-
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c | 199 +-
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_mdio.c | 15 +
+ drivers/net/ethernet/hisilicon/hibmcge/hbg_reg.h | 39 +
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 109 -
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 28 -
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 67 -
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 5 -
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h | 1 -
+ drivers/net/ethernet/huawei/hinic/hinic_port.c | 2 +-
+ drivers/net/ethernet/intel/Kconfig | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_xsk.c | 30 +-
+ drivers/net/ethernet/intel/ice/Makefile | 3 +-
+ drivers/net/ethernet/intel/ice/devlink/devlink.c | 2 +-
+ drivers/net/ethernet/intel/ice/devlink/health.c | 269 ++
+ drivers/net/ethernet/intel/ice/devlink/health.h | 58 +
+ .../intel/ice/devlink/{devlink_port.c => port.c} | 2 +-
+ .../intel/ice/devlink/{devlink_port.h => port.h} | 0
+ drivers/net/ethernet/intel/ice/ice.h | 2 +
+ drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 11 +-
+ drivers/net/ethernet/intel/ice/ice_base.c | 6 +-
+ drivers/net/ethernet/intel/ice/ice_common.c | 293 +--
+ drivers/net/ethernet/intel/ice/ice_common.h | 5 +-
+ drivers/net/ethernet/intel/ice/ice_eswitch.h | 2 +-
+ drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 49 +-
+ drivers/net/ethernet/intel/ice/ice_main.c | 26 +-
+ drivers/net/ethernet/intel/ice/ice_repr.c | 2 +-
+ drivers/net/ethernet/intel/ice/ice_sf_eth.c | 2 +-
+ drivers/net/ethernet/intel/ice/ice_xsk.c | 32 +-
+ drivers/net/ethernet/intel/ixgbe/Makefile | 4 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 13 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 3 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 25 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 3 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c | 2658 ++++++++++++++++++++
+ drivers/net/ethernet/intel/ixgbe/ixgbe_e610.h | 81 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 6 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 3 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 436 +++-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c | 4 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 5 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 72 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type_e610.h | 1074 ++++++++
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 12 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x540.h | 7 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 29 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x550.h | 20 +
+ drivers/net/ethernet/intel/ixgbevf/defines.h | 5 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 6 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 12 +-
+ drivers/net/ethernet/intel/ixgbevf/vf.c | 12 +-
+ drivers/net/ethernet/intel/ixgbevf/vf.h | 4 +-
+ drivers/net/ethernet/lantiq_etop.c | 25 +-
+ drivers/net/ethernet/marvell/mvneta.c | 27 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 25 +-
+ .../net/ethernet/marvell/octeon_ep/octep_main.c | 39 +
+ .../net/ethernet/marvell/octeon_ep/octep_main.h | 1 +
+ .../ethernet/marvell/octeon_ep/octep_pfvf_mbox.c | 23 +-
+ .../ethernet/marvell/octeon_ep/octep_pfvf_mbox.h | 6 +-
+ drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 4 +
+ .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 68 +-
+ .../net/ethernet/marvell/octeontx2/nic/Makefile | 1 +
+ .../ethernet/marvell/octeontx2/nic/cn10k_ipsec.c | 1056 ++++++++
+ .../ethernet/marvell/octeontx2/nic/cn10k_ipsec.h | 265 ++
+ .../ethernet/marvell/octeontx2/nic/otx2_common.c | 114 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_common.h | 28 +-
+ .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 3 +
+ .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 19 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 66 +-
+ .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 3 +
+ .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 10 +-
+ drivers/net/ethernet/mediatek/airoha_eth.c | 33 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 3 +-
+ .../mellanox/mlx5/core/diag/fs_tracepoint.h | 2 +-
+ .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 20 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 +-
+ .../mellanox/mlx5/core/esw/acl/egress_lgcy.c | 2 +-
+ .../mellanox/mlx5/core/esw/acl/ingress_lgcy.c | 2 +-
+ .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 20 +-
+ .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 5 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 12 +-
+ .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 311 +--
+ drivers/net/ethernet/mellanox/mlx5/core/fs_pool.c | 194 ++
+ drivers/net/ethernet/mellanox/mlx5/core/fs_pool.h | 54 +
+ .../net/ethernet/mellanox/mlx5/core/lag/debugfs.c | 13 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 365 ++-
+ drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h | 17 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c | 77 +-
+ .../net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 16 +-
+ .../net/ethernet/mellanox/mlx5/core/lag/port_sel.c | 55 +-
+ .../ethernet/mellanox/mlx5/core/lib/macsec_fs.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/rl.c | 4 +
+ .../ethernet/mellanox/mlx5/core/steering/hws/bwc.h | 6 +-
+ .../mellanox/mlx5/core/steering/hws/context.c | 6 +-
+ .../mellanox/mlx5/core/steering/hws/context.h | 6 +
+ .../mellanox/mlx5/core/steering/hws/mlx5hws.h | 1 -
+ .../mellanox/mlx5/core/steering/hws/send.c | 21 +-
+ .../mellanox/mlx5/core/steering/hws/send.h | 6 -
+ .../mellanox/mlx5/core/steering/sws/dr_domain.c | 2 +-
+ .../mellanox/mlx5/core/steering/sws/dr_ste.c | 6 +-
+ .../mellanox/mlx5/core/steering/sws/dr_ste.h | 19 +-
+ .../mellanox/mlx5/core/steering/sws/dr_ste_v0.c | 6 +-
+ .../mellanox/mlx5/core/steering/sws/dr_ste_v1.c | 207 +-
+ .../mellanox/mlx5/core/steering/sws/dr_ste_v1.h | 147 +-
+ .../mellanox/mlx5/core/steering/sws/dr_ste_v2.c | 169 +-
+ .../mellanox/mlx5/core/steering/sws/dr_ste_v2.h | 168 ++
+ .../mellanox/mlx5/core/steering/sws/dr_ste_v3.c | 221 ++
+ .../mellanox/mlx5/core/steering/sws/fs_dr.c | 2 +-
+ .../mellanox/mlx5/core/steering/sws/mlx5_ifc_dr.h | 40 +
+ .../mellanox/mlx5/core/steering/sws/mlx5dr.h | 2 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.h | 1 +
+ drivers/net/ethernet/mellanox/mlxsw/pci.c | 4 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 10 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 2 +-
+ drivers/net/ethernet/meta/fbnic/fbnic.h | 15 +
+ drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 551 +++-
+ drivers/net/ethernet/meta/fbnic/fbnic_irq.c | 53 +
+ drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 12 +-
+ drivers/net/ethernet/meta/fbnic/fbnic_netdev.h | 7 +-
+ drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 2 +-
+ drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 7 +-
+ drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 236 +-
+ drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 16 +-
+ drivers/net/ethernet/microchip/sparx5/Makefile | 3 +-
+ .../ethernet/microchip/sparx5/lan969x/lan969x.c | 5 +
+ .../ethernet/microchip/sparx5/lan969x/lan969x.h | 10 +
+ .../microchip/sparx5/lan969x/lan969x_rgmii.c | 224 ++
+ .../net/ethernet/microchip/sparx5/sparx5_main.c | 29 +-
+ .../net/ethernet/microchip/sparx5/sparx5_main.h | 3 +
+ .../ethernet/microchip/sparx5/sparx5_main_regs.h | 145 ++
+ .../net/ethernet/microchip/sparx5/sparx5_phylink.c | 14 +-
+ .../net/ethernet/microchip/sparx5/sparx5_port.c | 57 +-
+ .../net/ethernet/microchip/sparx5/sparx5_port.h | 5 +
+ drivers/net/ethernet/mscc/ocelot_net.c | 3 +-
+ .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 +-
+ drivers/net/ethernet/pensando/ionic/ionic.h | 3 -
+ .../net/ethernet/pensando/ionic/ionic_ethtool.c | 40 +
+ drivers/net/ethernet/pensando/ionic/ionic_if.h | 22 +-
+ drivers/net/ethernet/pensando/ionic/ionic_lif.c | 9 +-
+ drivers/net/ethernet/pensando/ionic/ionic_main.c | 3 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 20 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 69 +-
+ drivers/net/ethernet/realtek/r8169.h | 5 +-
+ drivers/net/ethernet/realtek/r8169_main.c | 94 +-
+ drivers/net/ethernet/realtek/r8169_phy_config.c | 15 +-
+ drivers/net/ethernet/realtek/rtase/rtase.h | 1 +
+ drivers/net/ethernet/realtek/rtase/rtase_main.c | 14 +-
+ drivers/net/ethernet/renesas/rswitch.c | 119 +-
+ drivers/net/ethernet/renesas/rswitch.h | 48 +-
+ drivers/net/ethernet/sfc/io.h | 24 -
+ drivers/net/ethernet/sfc/net_driver.h | 2 +
+ drivers/net/ethernet/sfc/rx_common.c | 5 +-
+ drivers/net/ethernet/sfc/siena/net_driver.h | 2 +
+ drivers/net/ethernet/sfc/siena/rx_common.c | 5 +-
+ drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 +
+ drivers/net/ethernet/stmicro/stmmac/Makefile | 1 +
+ drivers/net/ethernet/stmicro/stmmac/common.h | 16 +-
+ .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 11 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 27 +-
+ .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 22 +-
+ .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 30 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c | 202 ++
+ .../net/ethernet/stmicro/stmmac/dwmac-starfive.c | 19 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 18 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h | 3 +
+ drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 5 +
+ drivers/net/ethernet/stmicro/stmmac/hwif.c | 6 +-
+ drivers/net/ethernet/stmicro/stmmac/hwif.h | 17 +-
+ drivers/net/ethernet/stmicro/stmmac/mmc.h | 3 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 -
+ drivers/net/ethernet/stmicro/stmmac/stmmac_est.h | 2 +
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 39 -
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 71 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 3 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 11 -
+ drivers/net/ethernet/sun/niu.c | 22 +-
+ drivers/net/ethernet/ti/cpsw.c | 3 +-
+ drivers/net/ethernet/ti/cpsw_ethtool.c | 12 -
+ drivers/net/ethernet/ti/cpsw_new.c | 3 +-
+ drivers/net/ethernet/ti/cpsw_priv.h | 1 -
+ drivers/net/geneve.c | 12 +-
+ drivers/net/mctp/mctp-i2c.c | 3 +-
+ drivers/net/mdio/mdio-octeon.c | 25 +-
+ drivers/net/netconsole.c | 60 +-
+ drivers/net/pcs/pcs-lynx.c | 22 +
+ drivers/net/pcs/pcs-mtk-lynxi.c | 17 +
+ drivers/net/pcs/pcs-xpcs.c | 28 +
+ drivers/net/phy/Kconfig | 9 +-
+ drivers/net/phy/Makefile | 1 +
+ drivers/net/phy/bcm84881.c | 10 +
+ drivers/net/phy/dp83822.c | 106 +-
+ drivers/net/phy/marvell.c | 52 +-
+ drivers/net/phy/microchip_rds_ptp.c | 1039 ++++++++
+ drivers/net/phy/microchip_rds_ptp.h | 223 ++
+ drivers/net/phy/microchip_t1.c | 41 +-
+ drivers/net/phy/phy-c45.c | 14 +-
+ drivers/net/phy/phy.c | 62 +-
+ drivers/net/phy/phy_device.c | 27 +
+ drivers/net/phy/phylink.c | 359 ++-
+ drivers/net/phy/spi_ks8995.c | 8 +-
+ drivers/net/tap.c | 6 +-
+ drivers/net/team/team_core.c | 7 +
+ drivers/net/tun.c | 20 +-
+ drivers/net/usb/lan78xx.c | 938 ++++---
+ drivers/net/veth.c | 4 +-
+ drivers/net/vrf.c | 49 +-
+ drivers/net/vxlan/vxlan_core.c | 187 +-
+ drivers/net/vxlan/vxlan_mdb.c | 2 +-
+ drivers/net/wan/framer/framer-core.c | 23 +-
+ drivers/net/wireless/ath/ath11k/core.c | 132 +
+ drivers/net/wireless/ath/ath11k/core.h | 4 +-
+ drivers/net/wireless/ath/ath11k/dp.h | 1 -
+ drivers/net/wireless/ath/ath11k/dp_rx.c | 14 +-
+ drivers/net/wireless/ath/ath11k/hal.h | 6 +-
+ drivers/net/wireless/ath/ath11k/hal_rx.c | 3 +-
+ drivers/net/wireless/ath/ath11k/hw.h | 1 +
+ drivers/net/wireless/ath/ath11k/mac.c | 7 +-
+ drivers/net/wireless/ath/ath11k/mhi.c | 1 +
+ drivers/net/wireless/ath/ath11k/pci.c | 3 +
+ drivers/net/wireless/ath/ath11k/pcic.c | 13 +-
+ drivers/net/wireless/ath/ath11k/qmi.c | 8 +-
+ drivers/net/wireless/ath/ath11k/wow.c | 6 +-
+ drivers/net/wireless/ath/ath12k/core.c | 486 +++-
+ drivers/net/wireless/ath/ath12k/core.h | 134 +-
+ drivers/net/wireless/ath/ath12k/debug.c | 6 +-
+ drivers/net/wireless/ath/ath12k/debug.h | 5 +-
+ .../net/wireless/ath/ath12k/debugfs_htt_stats.c | 681 ++++-
+ .../net/wireless/ath/ath12k/debugfs_htt_stats.h | 218 +-
+ drivers/net/wireless/ath/ath12k/dp.c | 70 +-
+ drivers/net/wireless/ath/ath12k/dp.h | 3 +-
+ drivers/net/wireless/ath/ath12k/dp_rx.c | 96 +-
+ drivers/net/wireless/ath/ath12k/dp_rx.h | 6 +-
+ drivers/net/wireless/ath/ath12k/hal_desc.h | 2 +-
+ drivers/net/wireless/ath/ath12k/hal_rx.c | 12 +-
+ drivers/net/wireless/ath/ath12k/mac.c | 1999 +++++++++++----
+ drivers/net/wireless/ath/ath12k/mac.h | 16 +-
+ drivers/net/wireless/ath/ath12k/pci.c | 10 +
+ drivers/net/wireless/ath/ath12k/peer.c | 223 +-
+ drivers/net/wireless/ath/ath12k/peer.h | 23 +-
+ drivers/net/wireless/ath/ath12k/qmi.c | 167 +-
+ drivers/net/wireless/ath/ath12k/qmi.h | 20 +
+ drivers/net/wireless/ath/ath12k/wmi.c | 207 +-
+ drivers/net/wireless/ath/ath12k/wmi.h | 115 +
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 1 +
+ drivers/net/wireless/ath/ath9k/antenna.c | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9002_hw.c | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9003_mci.c | 4 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 2 +
+ drivers/net/wireless/ath/ath9k/channel.c | 2 +-
+ drivers/net/wireless/ath/ath9k/common-spectral.c | 2 +-
+ drivers/net/wireless/ath/ath9k/debug.c | 1 +
+ drivers/net/wireless/ath/ath9k/debug.h | 1 +
+ drivers/net/wireless/ath/ath9k/dfs.c | 2 +-
+ drivers/net/wireless/ath/ath9k/hif_usb.c | 2 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 4 +-
+ drivers/net/wireless/ath/ath9k/hw.h | 2 +-
+ drivers/net/wireless/ath/ath9k/link.c | 33 +-
+ drivers/net/wireless/ath/ath9k/mac.h | 2 +-
+ drivers/net/wireless/ath/ath9k/main.c | 5 +-
+ drivers/net/wireless/ath/ath9k/wow.c | 6 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 2 +-
+ drivers/net/wireless/ath/wcn36xx/main.c | 5 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 5 +
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 8 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 4 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/fwil.h | 2 +
+ .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 3 +
+ .../net/wireless/intel/iwlwifi/mvm/vendor-cmd.c | 6 +-
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +-
+ drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 2 +-
+ drivers/net/wireless/mediatek/mt76/mac80211.c | 2 +-
+ drivers/net/wireless/mediatek/mt76/mt76.h | 2 +-
+ drivers/net/wireless/microchip/wilc1000/cfg80211.c | 2 +-
+ drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 2 +-
+ drivers/net/wireless/quantenna/qtnfmac/core.h | 2 +-
+ drivers/net/wireless/realtek/rtl8xxxu/core.c | 20 +
+ drivers/net/wireless/realtek/rtlwifi/base.c | 13 +-
+ drivers/net/wireless/realtek/rtlwifi/base.h | 1 -
+ drivers/net/wireless/realtek/rtlwifi/pci.c | 61 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 7 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 4 +-
+ drivers/net/wireless/realtek/rtlwifi/usb.c | 12 +-
+ drivers/net/wireless/realtek/rtlwifi/wifi.h | 12 -
+ drivers/net/wireless/realtek/rtw88/rtw8812au.c | 68 +-
+ drivers/net/wireless/realtek/rtw88/rtw8821au.c | 52 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822bu.c | 6 +
+ drivers/net/wireless/realtek/rtw88/usb.c | 72 +-
+ drivers/net/wireless/realtek/rtw89/acpi.c | 47 +
+ drivers/net/wireless/realtek/rtw89/acpi.h | 9 +
+ drivers/net/wireless/realtek/rtw89/cam.c | 32 +-
+ drivers/net/wireless/realtek/rtw89/cam.h | 5 +
+ drivers/net/wireless/realtek/rtw89/core.c | 164 +-
+ drivers/net/wireless/realtek/rtw89/core.h | 145 ++
+ drivers/net/wireless/realtek/rtw89/debug.c | 4 +
+ drivers/net/wireless/realtek/rtw89/fw.c | 266 +-
+ drivers/net/wireless/realtek/rtw89/fw.h | 69 +-
+ drivers/net/wireless/realtek/rtw89/mac.c | 79 +-
+ drivers/net/wireless/realtek/rtw89/mac.h | 43 +
+ drivers/net/wireless/realtek/rtw89/mac80211.c | 289 ++-
+ drivers/net/wireless/realtek/rtw89/mac_be.c | 15 +
+ drivers/net/wireless/realtek/rtw89/pci.c | 16 +-
+ drivers/net/wireless/realtek/rtw89/pci.h | 9 +
+ drivers/net/wireless/realtek/rtw89/pci_be.c | 1 +
+ drivers/net/wireless/realtek/rtw89/phy.c | 315 ++-
+ drivers/net/wireless/realtek/rtw89/phy.h | 33 +-
+ drivers/net/wireless/realtek/rtw89/ps.c | 42 +-
+ drivers/net/wireless/realtek/rtw89/ps.h | 4 +-
+ drivers/net/wireless/realtek/rtw89/reg.h | 4 +
+ drivers/net/wireless/realtek/rtw89/regd.c | 57 +-
+ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 6 +-
+ drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c | 2 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 7 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852b.c | 3 +
+ .../net/wireless/realtek/rtw89/rtw8852b_common.c | 50 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852bt.c | 3 +
+ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 54 +-
+ drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 6 +-
+ drivers/net/wireless/realtek/rtw89/rtw8922a.c | 21 +-
+ drivers/net/wireless/realtek/rtw89/sar.c | 55 +-
+ drivers/net/wireless/realtek/rtw89/ser.c | 1 +
+ drivers/net/wireless/realtek/rtw89/txrx.h | 3 +
+ drivers/net/wireless/realtek/rtw89/wow.c | 11 +-
+ drivers/net/wireless/ti/wlcore/sysfs.c | 4 +-
+ drivers/net/wireless/ti/wlcore/testmode.c | 2 +-
+ drivers/net/wireless/virtual/mac80211_hwsim.c | 39 +
+ drivers/net/wwan/t7xx/t7xx_pci.c | 23 +-
+ drivers/ptp/ptp_ocp.c | 16 +-
+ drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 3 +-
+ drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 +-
+ include/linux/bpf.h | 12 +-
+ include/linux/etherdevice.h | 18 +-
+ include/linux/ethtool.h | 10 +-
+ include/linux/filter.h | 9 +-
+ include/linux/if_vlan.h | 28 +-
+ include/linux/igmp.h | 2 +
+ include/linux/ktime.h | 5 +
+ include/linux/mlx5/fs.h | 4 +-
+ include/linux/mlx5/mlx5_ifc.h | 59 +-
+ include/linux/net_tstamp.h | 29 +
+ include/linux/netdevice.h | 65 +-
+ include/linux/netfilter/x_tables.h | 2 +-
+ include/linux/netfilter_netdev.h | 3 +-
+ include/linux/netpoll.h | 2 +-
+ include/linux/packing.h | 425 ++++
+ include/linux/pci.h | 14 +
+ include/linux/phy.h | 60 +-
+ include/linux/phylink.h | 17 +
+ include/linux/ptp_clock_kernel.h | 4 +-
+ include/linux/ptr_ring.h | 21 +-
+ include/linux/rfkill.h | 2 +-
+ include/linux/rtnetlink.h | 8 +-
+ include/linux/skb_array.h | 17 +-
+ include/linux/skbuff.h | 65 +-
+ include/linux/stmmac.h | 10 +-
+ include/linux/wwan.h | 2 +-
+ include/net/addrconf.h | 21 +
+ include/net/cfg80211.h | 8 +-
+ include/net/devlink.h | 24 +-
+ include/net/dropreason-core.h | 54 +-
+ include/net/dsa.h | 2 +
+ include/net/dst.h | 11 +-
+ include/net/genetlink.h | 6 +-
+ include/net/inet_sock.h | 2 +-
+ include/net/inet_timewait_sock.h | 4 +
+ include/net/inetpeer.h | 12 +-
+ include/net/ip.h | 2 +-
+ include/net/ipv6.h | 2 +-
+ include/net/iucv/iucv.h | 30 +-
+ include/net/mac80211.h | 2 +-
+ include/net/netfilter/nf_tproxy.h | 4 +-
+ include/net/netlink.h | 44 +-
+ include/net/netmem.h | 78 +-
+ include/net/netns/ipv4.h | 1 +
+ include/net/page_pool/helpers.h | 82 +-
+ include/net/page_pool/types.h | 11 +-
+ include/net/pkt_cls.h | 4 +-
+ include/net/route.h | 42 +-
+ include/net/sch_generic.h | 8 +
+ include/net/sock.h | 8 +-
+ include/net/tcp.h | 2 +-
+ include/net/tls.h | 3 +
+ include/net/vxlan.h | 1 +
+ include/net/xdp.h | 193 +-
+ include/net/xdp_sock_drv.h | 29 +-
+ include/net/xsk_buff_pool.h | 4 +-
+ include/trace/events/fib6.h | 8 +-
+ include/trace/events/rxrpc.h | 880 ++++++-
+ include/uapi/asm-generic/socket.h | 2 +
+ include/uapi/linux/ethtool_netlink.h | 893 +------
+ include/uapi/linux/ethtool_netlink_generated.h | 818 ++++++
+ include/uapi/linux/fib_rules.h | 2 +
+ include/uapi/linux/if_link.h | 1 +
+ include/uapi/linux/net_tstamp.h | 11 +
+ include/uapi/linux/rtnetlink.h | 11 +-
+ include/uapi/linux/snmp.h | 5 +
+ kernel/bpf/cpumap.c | 2 +-
+ kernel/bpf/devmap.c | 8 +-
+ lib/packing.c | 293 ++-
+ lib/packing_test.c | 61 +
+ lib/win_minmax.c | 1 +
+ net/bpf/test_run.c | 4 +-
+ net/bridge/br.c | 7 +
+ net/bridge/br_fdb.c | 3 +-
+ net/bridge/br_forward.c | 16 +-
+ net/bridge/br_input.c | 20 +-
+ net/bridge/br_private.h | 9 +
+ net/bridge/br_sysfs_br.c | 6 +-
+ net/bridge/br_vlan.c | 44 +-
+ net/can/raw.c | 2 +-
+ net/core/dev.c | 20 +-
+ net/core/dev.h | 3 +
+ net/core/dev_ioctl.c | 47 +-
+ net/core/devmem.c | 10 +-
+ net/core/fib_rules.c | 2 +
+ net/core/filter.c | 46 +-
+ net/core/netpoll.c | 10 +-
+ net/core/page_pool.c | 139 +-
+ net/core/pktgen.c | 7 +-
+ net/core/rtnetlink.c | 116 +-
+ net/core/skbuff.c | 2 +-
+ net/core/sock.c | 26 +-
+ net/core/timestamping.c | 52 +-
+ net/core/xdp.c | 327 ++-
+ net/devlink/health.c | 67 +
+ net/devlink/port.c | 11 +-
+ net/dsa/port.c | 16 +
+ net/dsa/user.c | 15 +-
+ net/ethtool/Makefile | 2 +-
+ net/ethtool/common.c | 151 +-
+ net/ethtool/common.h | 13 +
+ net/ethtool/netlink.c | 24 +-
+ net/ethtool/netlink.h | 8 +-
+ net/ethtool/ts.h | 20 +
+ net/ethtool/tsconfig.c | 444 ++++
+ net/ethtool/tsinfo.c | 358 ++-
+ net/ipv4/af_inet.c | 14 +-
+ net/ipv4/datagram.c | 11 +-
+ net/ipv4/fib_rules.c | 6 +
+ net/ipv4/fib_trie.c | 4 +-
+ net/ipv4/icmp.c | 9 +-
+ net/ipv4/igmp.c | 66 +
+ net/ipv4/inet_connection_sock.c | 11 +-
+ net/ipv4/inetpeer.c | 49 +-
+ net/ipv4/ip_fragment.c | 15 +-
+ net/ipv4/ip_gre.c | 17 +-
+ net/ipv4/ip_input.c | 11 +-
+ net/ipv4/ip_output.c | 33 +-
+ net/ipv4/ip_sockglue.c | 2 +-
+ net/ipv4/raw.c | 2 +-
+ net/ipv4/route.c | 17 +-
+ net/ipv4/sysctl_net_ipv4.c | 10 +
+ net/ipv4/tcp_ipv4.c | 7 +-
+ net/ipv4/tcp_minisocks.c | 7 +-
+ net/ipv4/udp.c | 56 +
+ net/ipv6/addrconf.c | 28 +-
+ net/ipv6/fib6_rules.c | 57 +-
+ net/ipv6/icmp.c | 6 +-
+ net/ipv6/ioam6_iptunnel.c | 75 +-
+ net/ipv6/ip6_output.c | 22 +-
+ net/ipv6/mcast.c | 100 +-
+ net/ipv6/ndisc.c | 8 +-
+ net/ipv6/ping.c | 1 +
+ net/ipv6/raw.c | 3 +-
+ net/ipv6/route.c | 20 +-
+ net/ipv6/rpl_iptunnel.c | 46 +-
+ net/ipv6/seg6_iptunnel.c | 85 +-
+ net/ipv6/udp.c | 51 +
+ net/l2tp/l2tp_eth.c | 9 +-
+ net/l2tp/l2tp_ip.c | 19 +-
+ net/mac80211/cfg.c | 16 +-
+ net/mac80211/debugfs.c | 4 +-
+ net/mac80211/driver-ops.h | 7 +-
+ net/mac80211/ethtool.c | 22 +-
+ net/mac80211/ieee80211_i.h | 2 +-
+ net/mac80211/iface.c | 25 +-
+ net/mac80211/main.c | 9 +-
+ net/mac80211/rx.c | 4 +-
+ net/mac80211/trace.h | 10 +-
+ net/mac80211/util.c | 29 +-
+ net/mac802154/ieee802154_i.h | 3 -
+ net/mac802154/tx.c | 13 -
+ net/mctp/device.c | 50 +-
+ net/mptcp/pm_netlink.c | 46 +-
+ net/mptcp/pm_userspace.c | 295 +--
+ net/mptcp/protocol.h | 7 +-
+ net/netlink/af_netlink.c | 1 +
+ net/packet/af_packet.c | 2 +-
+ net/rxrpc/Makefile | 1 +
+ net/rxrpc/af_rxrpc.c | 4 +-
+ net/rxrpc/ar-internal.h | 342 ++-
+ net/rxrpc/call_accept.c | 22 +-
+ net/rxrpc/call_event.c | 395 ++-
+ net/rxrpc/call_object.c | 66 +-
+ net/rxrpc/conn_client.c | 26 +-
+ net/rxrpc/conn_event.c | 40 +-
+ net/rxrpc/conn_object.c | 14 +-
+ net/rxrpc/input.c | 708 ++++--
+ net/rxrpc/input_rack.c | 418 +++
+ net/rxrpc/insecure.c | 5 +-
+ net/rxrpc/io_thread.c | 117 +-
+ net/rxrpc/local_object.c | 3 -
+ net/rxrpc/misc.c | 4 +-
+ net/rxrpc/output.c | 596 +++--
+ net/rxrpc/peer_event.c | 114 +-
+ net/rxrpc/peer_object.c | 30 +-
+ net/rxrpc/proc.c | 61 +-
+ net/rxrpc/protocol.h | 13 +-
+ net/rxrpc/recvmsg.c | 18 +-
+ net/rxrpc/rtt.c | 103 +-
+ net/rxrpc/rxkad.c | 59 +-
+ net/rxrpc/rxperf.c | 2 +-
+ net/rxrpc/security.c | 4 +-
+ net/rxrpc/sendmsg.c | 100 +-
+ net/rxrpc/sysctl.c | 6 +-
+ net/rxrpc/txbuf.c | 127 +-
+ net/sched/sch_cake.c | 43 +-
+ net/sched/sch_codel.c | 5 +-
+ net/sched/sch_fq.c | 14 +-
+ net/sched/sch_fq_codel.c | 3 +-
+ net/sched/sch_fq_pie.c | 6 +-
+ net/sched/sch_generic.c | 4 +-
+ net/sched/sch_gred.c | 4 +-
+ net/sched/sch_pie.c | 5 +-
+ net/sched/sch_red.c | 4 +-
+ net/sched/sch_sfb.c | 4 +-
+ net/sched/sch_sfq.c | 4 +
+ net/smc/af_smc.c | 5 +-
+ net/smc/smc_core.c | 5 +
+ net/smc/smc_core.h | 11 +-
+ net/smc/smc_ib.c | 3 +-
+ net/smc/smc_llc.c | 21 +-
+ net/smc/smc_wr.c | 42 +-
+ net/socket.c | 11 +
+ net/tipc/name_table.c | 4 +-
+ net/tipc/name_table.h | 2 +
+ net/tls/tls.h | 3 +-
+ net/tls/tls_device.c | 2 +-
+ net/tls/tls_main.c | 71 +-
+ net/tls/tls_proc.c | 5 +
+ net/tls/tls_sw.c | 140 +-
+ net/unix/Kconfig | 4 +-
+ net/unix/af_unix.c | 196 +-
+ net/wireless/chan.c | 4 +-
+ net/wireless/core.c | 42 +-
+ net/wireless/mlme.c | 8 +-
+ net/wireless/nl80211.c | 203 +-
+ net/wireless/pmsr.c | 4 +-
+ net/wireless/rdev-ops.h | 7 +-
+ net/wireless/reg.c | 53 +-
+ net/wireless/scan.c | 40 +-
+ net/wireless/sme.c | 12 +-
+ net/wireless/tests/scan.c | 2 +
+ net/wireless/trace.h | 44 +-
+ net/wireless/util.c | 7 +-
+ net/wireless/wext-compat.c | 317 +--
+ net/wireless/wext-sme.c | 43 +-
+ rust/kernel/net/phy.rs | 4 +-
+ scripts/.gitignore | 1 +
+ scripts/Makefile | 2 +-
+ scripts/checkpatch.pl | 2 +
+ scripts/gen_packed_field_checks.c | 37 +
+ tools/include/uapi/asm-generic/socket.h | 2 +
+ tools/net/ynl/ynl-gen-c.py | 147 +-
+ tools/testing/selftests/drivers/net/hw/ncdevmem.c | 3 -
+ tools/testing/selftests/drivers/net/lib/py/env.py | 9 +-
+ tools/testing/selftests/net/Makefile | 2 +
+ tools/testing/selftests/net/busy_poller.c | 88 +-
+ tools/testing/selftests/net/cmsg_sender.c | 11 +-
+ tools/testing/selftests/net/cmsg_so_priority.sh | 151 ++
+ tools/testing/selftests/net/fdb_notify.sh | 6 +-
+ tools/testing/selftests/net/fib_rule_tests.sh | 31 +
+ tools/testing/selftests/net/forwarding/Makefile | 1 +
+ .../net/forwarding/bridge_vlan_unaware.sh | 25 +-
+ tools/testing/selftests/net/forwarding/lib.sh | 7 -
+ .../selftests/net/forwarding/vxlan_reserved.sh | 352 +++
+ tools/testing/selftests/net/lib.sh | 68 +-
+ tools/testing/selftests/net/lib/py/utils.py | 6 +-
+ .../packetdrill/tcp_blocking_blocking-accept.pkt | 18 +
+ .../packetdrill/tcp_blocking_blocking-connect.pkt | 13 +
+ .../net/packetdrill/tcp_blocking_blocking-read.pkt | 29 +
+ .../packetdrill/tcp_blocking_blocking-write.pkt | 35 +
+ ...tcp_close_close-local-close-then-remote-fin.pkt | 23 +
+ .../packetdrill/tcp_close_close-on-syn-sent.pkt | 21 +
+ .../tcp_close_close-remote-fin-then-close.pkt | 36 +
+ .../net/packetdrill/tcp_ecn_ecn-uses-ect0.pkt | 21 +
+ .../net/packetdrill/tcp_eor_no-coalesce-large.pkt | 38 +
+ .../packetdrill/tcp_eor_no-coalesce-retrans.pkt | 72 +
+ .../net/packetdrill/tcp_eor_no-coalesce-small.pkt | 36 +
+ .../packetdrill/tcp_eor_no-coalesce-subsequent.pkt | 66 +
+ .../tcp_fast_recovery_prr-ss-10pkt-lost-1.pkt | 72 +
+ ...p_fast_recovery_prr-ss-30pkt-lost-1_4-11_16.pkt | 50 +
+ .../tcp_fast_recovery_prr-ss-30pkt-lost1_4.pkt | 43 +
+ ...ast_recovery_prr-ss-ack-below-snd_una-cubic.pkt | 41 +
+ ...p_limited_transmit_limited-transmit-no-sack.pkt | 53 +
+ .../tcp_limited_transmit_limited-transmit-sack.pkt | 50 +
+ .../net/packetdrill/tcp_nagle_https_client.pkt | 40 +
+ .../net/packetdrill/tcp_nagle_sendmsg_msg_more.pkt | 66 +
+ .../packetdrill/tcp_nagle_sockopt_cork_nodelay.pkt | 43 +
+ .../tcp_sack_sack-route-refresh-ip-tos.pkt | 37 +
+ ...tcp_sack_sack-shift-sacked-2-6-8-3-9-nofack.pkt | 64 +
+ .../tcp_sack_sack-shift-sacked-7-3-4-8-9-fack.pkt | 66 +
+ .../tcp_sack_sack-shift-sacked-7-5-6-8-9-fack.pkt | 62 +
+ .../packetdrill/tcp_sendfile_sendfile-simple.pkt | 26 +
+ .../tcp_splice_tcp_splice_loop_test.pkt | 20 +
+ ...cp_syscall_bad_arg_fastopen-invalid-buf-ptr.pkt | 42 +
+ .../tcp_syscall_bad_arg_sendmsg-empty-iov.pkt | 30 +
+ ...tcp_syscall_bad_arg_syscall-invalid-buf-ptr.pkt | 25 +
+ .../tcp_tcp_info_tcp-info-last_data_recv.pkt | 20 +
+ .../tcp_tcp_info_tcp-info-rwnd-limited.pkt | 54 +
+ .../tcp_tcp_info_tcp-info-sndbuf-limited.pkt | 38 +
+ .../tcp_timestamping_client-only-last-byte.pkt | 92 +
+ .../net/packetdrill/tcp_timestamping_partial.pkt | 91 +
+ .../net/packetdrill/tcp_timestamping_server.pkt | 145 ++
+ .../net/packetdrill/tcp_ts_recent_fin_tsval.pkt | 23 +
+ .../net/packetdrill/tcp_ts_recent_invalid_ack.pkt | 25 +
+ .../net/packetdrill/tcp_ts_recent_reset_tsval.pkt | 25 +
+ .../tcp_user_timeout_user-timeout-probe.pkt | 37 +
+ .../packetdrill/tcp_user_timeout_user_timeout.pkt | 32 +
+ .../tcp_validate_validate-established-no-flags.pkt | 24 +
+ tools/testing/selftests/net/tls.c | 478 +++-
+ tools/testing/selftests/net/udpgso_bench.sh | 3 +
+ tools/testing/selftests/net/vlan_bridge_binding.sh | 256 ++
+ .../tc-testing/scripts/sfq_rejects_limit_1.py | 21 +
+ .../selftests/tc-testing/tc-tests/qdiscs/sfq.json | 20 +
+ tools/testing/vsock/README | 15 +
+ tools/testing/vsock/util.c | 33 +-
+ tools/testing/vsock/util.h | 2 +
+ tools/testing/vsock/vsock_test.c | 265 +-
+ 719 files changed, 33785 insertions(+), 9002 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/nxp,s32-dwmac.yaml
+ create mode 100644 Documentation/networking/netmem.rst
+ create mode 100644 drivers/net/ethernet/hisilicon/hibmcge/hbg_debugfs.c
+ create mode 100644 drivers/net/ethernet/hisilicon/hibmcge/hbg_debugfs.h
+ create mode 100644 drivers/net/ethernet/hisilicon/hibmcge/hbg_err.c
+ create mode 100644 drivers/net/ethernet/hisilicon/hibmcge/hbg_err.h
+ create mode 100644 drivers/net/ethernet/intel/ice/devlink/health.c
+ create mode 100644 drivers/net/ethernet/intel/ice/devlink/health.h
+ rename drivers/net/ethernet/intel/ice/devlink/{devlink_port.c => port.c} (99%)
+ rename drivers/net/ethernet/intel/ice/devlink/{devlink_port.h => port.h} (100%)
+ create mode 100644 drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c
+ create mode 100644 drivers/net/ethernet/intel/ixgbe/ixgbe_e610.h
+ create mode 100644 drivers/net/ethernet/intel/ixgbe/ixgbe_type_e610.h
+ create mode 100644 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.h
+ create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/cn10k_ipsec.c
+ create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/cn10k_ipsec.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fs_pool.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fs_pool.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v2.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v3.c
+ create mode 100644 drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_rgmii.c
+ create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c
+ create mode 100644 drivers/net/phy/microchip_rds_ptp.c
+ create mode 100644 drivers/net/phy/microchip_rds_ptp.h
+ create mode 100644 include/uapi/linux/ethtool_netlink_generated.h
+ create mode 100644 net/ethtool/ts.h
+ create mode 100644 net/ethtool/tsconfig.c
+ create mode 100644 net/rxrpc/input_rack.c
+ create mode 100644 scripts/gen_packed_field_checks.c
+ create mode 100755 tools/testing/selftests/net/cmsg_so_priority.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/vxlan_reserved.sh
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_blocking_blocking-accept.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_blocking_blocking-connect.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_blocking_blocking-read.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_blocking_blocking-write.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_close_close-local-close-then-remote-fin.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_close_close-on-syn-sent.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_close_close-remote-fin-then-close.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_ecn_ecn-uses-ect0.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_eor_no-coalesce-large.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_eor_no-coalesce-retrans.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_eor_no-coalesce-small.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_eor_no-coalesce-subsequent.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_fast_recovery_prr-ss-10pkt-lost-1.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_fast_recovery_prr-ss-30pkt-lost-1_4-11_16.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_fast_recovery_prr-ss-30pkt-lost1_4.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_fast_recovery_prr-ss-ack-below-snd_una-cubic.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_limited_transmit_limited-transmit-no-sack.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_limited_transmit_limited-transmit-sack.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_nagle_https_client.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_nagle_sendmsg_msg_more.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_nagle_sockopt_cork_nodelay.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_sack_sack-route-refresh-ip-tos.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_sack_sack-shift-sacked-2-6-8-3-9-nofack.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_sack_sack-shift-sacked-7-3-4-8-9-fack.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_sack_sack-shift-sacked-7-5-6-8-9-fack.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_sendfile_sendfile-simple.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_splice_tcp_splice_loop_test.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_syscall_bad_arg_fastopen-invalid-buf-ptr.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_syscall_bad_arg_sendmsg-empty-iov.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_syscall_bad_arg_syscall-invalid-buf-ptr.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_tcp_info_tcp-info-last_data_recv.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_tcp_info_tcp-info-rwnd-limited.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_tcp_info_tcp-info-sndbuf-limited.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_timestamping_client-only-last-byte.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_timestamping_partial.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_timestamping_server.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_ts_recent_fin_tsval.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_ts_recent_invalid_ack.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_ts_recent_reset_tsval.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_user_timeout_user-timeout-probe.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_user_timeout_user_timeout.pkt
+ create mode 100644 tools/testing/selftests/net/packetdrill/tcp_validate_validate-established-no-flags.pkt
+ create mode 100755 tools/testing/selftests/net/vlan_bridge_binding.sh
+ create mode 100755 tools/testing/selftests/tc-testing/scripts/sfq_rejects_limit_1.py
+Merging bpf-next/for-next (69f0f830dad8 Merge branch 'bpf-next/master' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next
+Auto-merging include/linux/bpf.h
+Auto-merging kernel/bpf/verifier.c
+Auto-merging net/bpf/test_run.c
+Merge made by the 'ort' strategy.
+ include/linux/bpf.h | 17 +
+ include/linux/bpf_verifier.h | 26 +-
+ include/uapi/linux/bpf.h | 10 +
+ kernel/bpf/arena.c | 10 +-
+ kernel/bpf/bpf_local_storage.c | 8 +-
+ kernel/bpf/btf.c | 11 +-
+ kernel/bpf/helpers.c | 21 +
+ kernel/bpf/log.c | 21 +-
+ kernel/bpf/syscall.c | 2 +-
+ kernel/bpf/verifier.c | 1033 ++++++++++++++------
+ kernel/trace/bpf_trace.c | 33 +-
+ net/bpf/test_run.c | 1 +
+ samples/bpf/Makefile | 2 +-
+ samples/bpf/xdp2skb_meta_kern.c | 1 -
+ scripts/link-vmlinux.sh | 6 +-
+ security/bpf/hooks.c | 1 -
+ tools/bpf/bpftool/Documentation/bpftool-btf.rst | 9 +-
+ tools/bpf/bpftool/bash-completion/bpftool | 7 +-
+ tools/bpf/bpftool/btf.c | 51 +-
+ tools/bpf/bpftool/feature.c | 23 +
+ tools/bpf/resolve_btfids/main.c | 12 +-
+ tools/include/linux/filter.h | 10 +
+ tools/include/uapi/linux/bpf.h | 10 +
+ tools/lib/bpf/bpf.c | 3 +-
+ tools/lib/bpf/bpf.h | 5 +-
+ tools/lib/bpf/btf.c | 2 +-
+ tools/lib/bpf/libbpf.c | 14 +-
+ tools/lib/bpf/libbpf.h | 5 +
+ tools/lib/bpf/libbpf.map | 4 +
+ tools/lib/bpf/linker.c | 248 +++--
+ tools/lib/bpf/usdt.c | 2 +-
+ tools/testing/selftests/bpf/.gitignore | 1 -
+ tools/testing/selftests/bpf/Makefile | 73 +-
+ .../selftests/bpf/bpf_test_modorder_x/Makefile | 19 -
+ .../selftests/bpf/bpf_test_modorder_y/Makefile | 19 -
+ .../testing/selftests/bpf/bpf_test_no_cfi/Makefile | 19 -
+ tools/testing/selftests/bpf/bpf_testmod/Makefile | 20 -
+ tools/testing/selftests/bpf/config | 1 +
+ tools/testing/selftests/bpf/network_helpers.c | 2 +-
+ tools/testing/selftests/bpf/network_helpers.h | 96 ++
+ .../prog_tests/cgroup_skb_direct_packet_access.c | 28 +
+ .../testing/selftests/bpf/prog_tests/core_reloc.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/fd_array.c | 441 +++++++++
+ .../selftests/bpf/prog_tests/fill_link_info.c | 4 +
+ .../selftests/bpf/prog_tests/flow_dissector.c | 329 +++++--
+ .../bpf/prog_tests/flow_dissector_classification.c | 792 +++++++++++++++
+ .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 2 +-
+ tools/testing/selftests/bpf/prog_tests/verifier.c | 2 +
+ .../testing/selftests/bpf/prog_tests/xdp_bonding.c | 2 +-
+ .../bpf/prog_tests/xdp_context_test_run.c | 87 ++
+ .../selftests/bpf/prog_tests/xdp_do_redirect.c | 2 +-
+ .../selftests/bpf/prog_tests/xdp_flowtable.c | 2 +-
+ .../selftests/bpf/prog_tests/xdp_metadata.c | 21 +-
+ tools/testing/selftests/bpf/progs/bad_struct_ops.c | 2 +-
+ tools/testing/selftests/bpf/progs/cb_refs.c | 2 +-
+ .../bpf/progs/cgroup_skb_direct_packet_access.c | 15 +
+ tools/testing/selftests/bpf/progs/epilogue_exit.c | 4 +-
+ .../selftests/bpf/progs/epilogue_tailcall.c | 4 +-
+ .../testing/selftests/bpf/progs/exceptions_fail.c | 4 +-
+ tools/testing/selftests/bpf/progs/irq.c | 444 +++++++++
+ tools/testing/selftests/bpf/progs/iters_testmod.c | 2 +-
+ tools/testing/selftests/bpf/progs/jit_probe_mem.c | 2 +-
+ .../selftests/bpf/progs/kfunc_call_destructive.c | 2 +-
+ .../testing/selftests/bpf/progs/kfunc_call_fail.c | 2 +-
+ .../testing/selftests/bpf/progs/kfunc_call_race.c | 2 +-
+ .../testing/selftests/bpf/progs/kfunc_call_test.c | 2 +-
+ .../selftests/bpf/progs/kfunc_call_test_subprog.c | 2 +-
+ .../testing/selftests/bpf/progs/local_kptr_stash.c | 2 +-
+ tools/testing/selftests/bpf/progs/map_kptr.c | 2 +-
+ tools/testing/selftests/bpf/progs/map_kptr_fail.c | 2 +-
+ tools/testing/selftests/bpf/progs/missed_kprobe.c | 2 +-
+ .../selftests/bpf/progs/missed_kprobe_recursion.c | 2 +-
+ tools/testing/selftests/bpf/progs/nested_acquire.c | 2 +-
+ tools/testing/selftests/bpf/progs/preempt_lock.c | 28 +-
+ tools/testing/selftests/bpf/progs/pro_epilogue.c | 4 +-
+ .../selftests/bpf/progs/pro_epilogue_goto_start.c | 4 +-
+ tools/testing/selftests/bpf/progs/sock_addr_kern.c | 2 +-
+ .../selftests/bpf/progs/struct_ops_detach.c | 2 +-
+ .../selftests/bpf/progs/struct_ops_forgotten_cb.c | 2 +-
+ .../selftests/bpf/progs/struct_ops_maybe_null.c | 2 +-
+ .../bpf/progs/struct_ops_maybe_null_fail.c | 2 +-
+ .../selftests/bpf/progs/struct_ops_module.c | 2 +-
+ .../selftests/bpf/progs/struct_ops_multi_pages.c | 2 +-
+ .../selftests/bpf/progs/struct_ops_nulled_out_cb.c | 2 +-
+ .../selftests/bpf/progs/struct_ops_private_stack.c | 2 +-
+ .../bpf/progs/struct_ops_private_stack_fail.c | 2 +-
+ .../bpf/progs/struct_ops_private_stack_recur.c | 2 +-
+ tools/testing/selftests/bpf/progs/syscall.c | 6 +-
+ .../selftests/bpf/progs/test_cls_redirect.c | 2 +-
+ .../selftests/bpf/progs/test_cls_redirect.h | 2 +-
+ .../selftests/bpf/progs/test_cls_redirect_dynptr.c | 2 +-
+ .../selftests/bpf/progs/test_fill_link_info.c | 13 +-
+ .../bpf/progs/test_kfunc_param_nullable.c | 2 +-
+ .../selftests/bpf/progs/test_module_attach.c | 2 +-
+ .../selftests/bpf/progs/test_tp_btf_nullable.c | 2 +-
+ tools/testing/selftests/bpf/progs/test_xdp_meta.c | 4 +-
+ .../testing/selftests/bpf/progs/unsupported_ops.c | 2 +-
+ .../testing/selftests/bpf/progs/verifier_bounds.c | 134 +++
+ .../selftests/bpf/progs/verifier_spin_lock.c | 2 +-
+ tools/testing/selftests/bpf/progs/wq.c | 2 +-
+ tools/testing/selftests/bpf/progs/wq_failures.c | 2 +-
+ .../selftests/bpf/test_bpftool_synctypes.py | 28 +-
+ tools/testing/selftests/bpf/test_flow_dissector.c | 780 ---------------
+ tools/testing/selftests/bpf/test_flow_dissector.sh | 178 ----
+ .../bpf/{bpf_testmod => test_kmods}/.gitignore | 0
+ tools/testing/selftests/bpf/test_kmods/Makefile | 21 +
+ .../bpf_test_modorder_x.c | 0
+ .../bpf_test_modorder_y.c | 0
+ .../bpf_test_no_cfi.c | 0
+ .../bpf_testmod-events.h | 0
+ .../bpf/{bpf_testmod => test_kmods}/bpf_testmod.c | 0
+ .../bpf/{bpf_testmod => test_kmods}/bpf_testmod.h | 0
+ .../bpf_testmod_kfunc.h | 0
+ tools/testing/selftests/bpf/test_progs.c | 15 +
+ tools/testing/selftests/bpf/test_progs.h | 15 +
+ tools/testing/selftests/bpf/test_tc_tunnel.sh | 1 +
+ tools/testing/selftests/bpf/test_xdp_meta.sh | 58 --
+ tools/testing/selftests/bpf/veristat.c | 82 +-
+ tools/testing/selftests/bpf/xdp_hw_metadata.c | 5 +-
+ 119 files changed, 3702 insertions(+), 1789 deletions(-)
+ delete mode 100644 tools/testing/selftests/bpf/bpf_test_modorder_x/Makefile
+ delete mode 100644 tools/testing/selftests/bpf/bpf_test_modorder_y/Makefile
+ delete mode 100644 tools/testing/selftests/bpf/bpf_test_no_cfi/Makefile
+ delete mode 100644 tools/testing/selftests/bpf/bpf_testmod/Makefile
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_skb_direct_packet_access.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/fd_array.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/flow_dissector_classification.c
+ create mode 100644 tools/testing/selftests/bpf/progs/cgroup_skb_direct_packet_access.c
+ create mode 100644 tools/testing/selftests/bpf/progs/irq.c
+ delete mode 100644 tools/testing/selftests/bpf/test_flow_dissector.c
+ delete mode 100755 tools/testing/selftests/bpf/test_flow_dissector.sh
+ rename tools/testing/selftests/bpf/{bpf_testmod => test_kmods}/.gitignore (100%)
+ create mode 100644 tools/testing/selftests/bpf/test_kmods/Makefile
+ rename tools/testing/selftests/bpf/{bpf_test_modorder_x => test_kmods}/bpf_test_modorder_x.c (100%)
+ rename tools/testing/selftests/bpf/{bpf_test_modorder_y => test_kmods}/bpf_test_modorder_y.c (100%)
+ rename tools/testing/selftests/bpf/{bpf_test_no_cfi => test_kmods}/bpf_test_no_cfi.c (100%)
+ rename tools/testing/selftests/bpf/{bpf_testmod => test_kmods}/bpf_testmod-events.h (100%)
+ rename tools/testing/selftests/bpf/{bpf_testmod => test_kmods}/bpf_testmod.c (100%)
+ rename tools/testing/selftests/bpf/{bpf_testmod => test_kmods}/bpf_testmod.h (100%)
+ rename tools/testing/selftests/bpf/{bpf_testmod => test_kmods}/bpf_testmod_kfunc.h (100%)
+ delete mode 100755 tools/testing/selftests/bpf/test_xdp_meta.sh
+Merging ipsec-next/master (59af653a6998 Merge branch 'Add IP-TFS mode to xfrm')
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master
+Auto-merging include/uapi/linux/snmp.h
+Auto-merging net/xfrm/xfrm_state.c
+Merge made by the 'ort' strategy.
+ include/net/xfrm.h | 44 +
+ include/uapi/linux/in.h | 2 +
+ include/uapi/linux/ip.h | 16 +
+ include/uapi/linux/ipsec.h | 3 +-
+ include/uapi/linux/snmp.h | 2 +
+ include/uapi/linux/xfrm.h | 9 +-
+ net/ipv4/esp4.c | 3 +-
+ net/ipv6/esp6.c | 3 +-
+ net/netfilter/nft_xfrm.c | 3 +-
+ net/xfrm/Kconfig | 16 +
+ net/xfrm/Makefile | 1 +
+ net/xfrm/trace_iptfs.h | 218 ++++
+ net/xfrm/xfrm_compat.c | 10 +-
+ net/xfrm/xfrm_device.c | 4 +-
+ net/xfrm/xfrm_input.c | 18 +-
+ net/xfrm/xfrm_iptfs.c | 2764 ++++++++++++++++++++++++++++++++++++++++++++
+ net/xfrm/xfrm_output.c | 6 +
+ net/xfrm/xfrm_policy.c | 26 +-
+ net/xfrm/xfrm_proc.c | 2 +
+ net/xfrm/xfrm_state.c | 84 ++
+ net/xfrm/xfrm_user.c | 77 ++
+ 21 files changed, 3292 insertions(+), 19 deletions(-)
+ create mode 100644 net/xfrm/trace_iptfs.h
+ create mode 100644 net/xfrm/xfrm_iptfs.c
+Merging mlx5-next/mlx5-next (aeb3ec990269 net/mlx5: Add device cap abs_native_port_num)
+$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next
+Already up to date.
+Merging netfilter-next/main (4b252f2dab2e Merge branch 'selftests-net-packetdrill-import-multiple-tests')
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main
+Already up to date.
+Merging ipvs-next/main (f3674384709b Merge branch 'net-smc-two-features-for-smc-r')
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main
+Already up to date.
+Merging bluetooth/master (514e14b1a7c3 Bluetooth: MGMT: Mark LL Privacy as stable)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master
+Auto-merging include/net/bluetooth/hci_core.h
+Auto-merging net/bluetooth/hci_core.c
+Auto-merging net/bluetooth/hci_event.c
+Auto-merging net/bluetooth/iso.c
+Auto-merging net/bluetooth/mgmt.c
+Merge made by the 'ort' strategy.
+ include/net/bluetooth/hci.h | 1 -
+ include/net/bluetooth/hci_core.h | 11 +--
+ net/bluetooth/hci_sync.c | 63 ++++++++-------
+ net/bluetooth/iso.c | 36 +++++++++
+ net/bluetooth/mgmt.c | 171 +++++++++------------------------------
+ 5 files changed, 113 insertions(+), 169 deletions(-)
+Merging wireless-next/for-next (b73e56f16250 Merge branch 'xdp-a-fistful-of-generic-changes-pt-iii')
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next
+Already up to date.
+Merging ath-next/for-next (578f6fc55c2c wifi: ath12k: Fix spelling mistake "requestted" -> "requested")
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/net/wireless/qcom,ath12k-wsi.yaml | 204 +++++++
+ drivers/net/wireless/ath/ath12k/core.c | 293 ++++++++-
+ drivers/net/wireless/ath/ath12k/core.h | 46 +-
+ drivers/net/wireless/ath/ath12k/dp.c | 14 +
+ drivers/net/wireless/ath/ath12k/dp.h | 18 +-
+ drivers/net/wireless/ath/ath12k/dp_mon.c | 156 ++---
+ drivers/net/wireless/ath/ath12k/dp_rx.c | 225 +++++--
+ drivers/net/wireless/ath/ath12k/fw.h | 3 +
+ drivers/net/wireless/ath/ath12k/hal.c | 2 +-
+ drivers/net/wireless/ath/ath12k/hal.h | 2 +-
+ drivers/net/wireless/ath/ath12k/hal_desc.h | 4 +-
+ drivers/net/wireless/ath/ath12k/hal_rx.h | 14 +-
+ drivers/net/wireless/ath/ath12k/mac.c | 665 +++++++++++++++++----
+ drivers/net/wireless/ath/ath12k/mac.h | 3 +
+ drivers/net/wireless/ath/ath12k/peer.c | 2 +
+ drivers/net/wireless/ath/ath12k/peer.h | 3 +
+ drivers/net/wireless/ath/ath12k/qmi.c | 324 ++++++++--
+ drivers/net/wireless/ath/ath12k/qmi.h | 1 +
+ drivers/net/wireless/ath/ath12k/wmi.c | 208 ++++++-
+ drivers/net/wireless/ath/ath12k/wmi.h | 56 ++
+ drivers/net/wireless/ath/ath9k/ath9k.h | 8 +-
+ drivers/net/wireless/ath/ath9k/beacon.c | 2 +-
+ drivers/net/wireless/ath/ath9k/channel.c | 29 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 25 +-
+ drivers/net/wireless/ath/ath9k/hw.h | 2 +-
+ drivers/net/wireless/ath/ath9k/main.c | 9 +-
+ drivers/net/wireless/ath/ath9k/recv.c | 4 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 52 +-
+ 28 files changed, 1913 insertions(+), 461 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath12k-wsi.yaml
+Merging wpan-next/master (3e5908172c05 Merge tag 'ieee802154-for-net-next-2025-01-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master
+Already up to date.
+Merging wpan-staging/staging (3e5908172c05 Merge tag 'ieee802154-for-net-next-2025-01-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next)
+$ git merge -m Merge branch 'staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging
+Already up to date.
+Merging mtd/mtd/next (02ba194feacb mtd: mchp48l640: add support for Fujitsu MB85RS128TY FRAM)
+$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next
+Merge made by the 'ort' strategy.
+ .../bindings/mtd/microchip,mchp48l640.yaml | 5 ++--
+ drivers/mtd/devices/mchp48l640.c | 28 +++++++++++++++++++---
+ drivers/mtd/devices/phram.c | 13 ++++++----
+ 3 files changed, 37 insertions(+), 9 deletions(-)
+Merging nand/nand/next (8d3cd6b87557 Merge tag 'mtd/qcom-reorg-for-spi-6.14' into nand/next)
+$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../bindings/mtd/cadence-nand-controller.txt | 53 -
+ .../devicetree/bindings/mtd/cdns,hp-nfc.yaml | 75 +
+ .../devicetree/bindings/mtd/davinci-nand.txt | 94 --
+ .../bindings/mtd/nuvoton,ma35d1-nand.yaml | 95 ++
+ .../devicetree/bindings/mtd/ti,davinci-nand.yaml | 124 ++
+ MAINTAINERS | 2 +-
+ drivers/mtd/nand/Makefile | 2 +-
+ drivers/mtd/nand/onenand/onenand_base.c | 1 +
+ drivers/mtd/nand/qpic_common.c | 759 +++++++++
+ drivers/mtd/nand/raw/Kconfig | 12 +-
+ drivers/mtd/nand/raw/Makefile | 1 +
+ drivers/mtd/nand/raw/brcmnand/brcmnand.c | 5 +
+ drivers/mtd/nand/raw/davinci_nand.c | 90 +
+ .../mtd/nand/raw/nuvoton-ma35d1-nand-controller.c | 1029 ++++++++++++
+ drivers/mtd/nand/raw/qcom_nandc.c | 1769 ++++----------------
+ drivers/mtd/nand/spi/Makefile | 2 +-
+ drivers/mtd/nand/spi/core.c | 25 +-
+ drivers/mtd/nand/spi/foresee.c | 10 +
+ drivers/mtd/nand/spi/skyhigh.c | 147 ++
+ include/linux/mtd/nand-qpic-common.h | 475 ++++++
+ include/linux/mtd/spinand.h | 2 +
+ 21 files changed, 3172 insertions(+), 1600 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/mtd/cadence-nand-controller.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/cdns,hp-nfc.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mtd/davinci-nand.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/nuvoton,ma35d1-nand.yaml
+ create mode 100644 Documentation/devicetree/bindings/mtd/ti,davinci-nand.yaml
+ create mode 100644 drivers/mtd/nand/qpic_common.c
+ create mode 100644 drivers/mtd/nand/raw/nuvoton-ma35d1-nand-controller.c
+ create mode 100644 drivers/mtd/nand/spi/skyhigh.c
+ create mode 100644 include/linux/mtd/nand-qpic-common.h
+$ git reset --hard HEAD^
+HEAD is now at 0a32b319d1bb Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
+Merging next-20241220 version of nand
+$ git merge -m next-20241220/nand 1a50e3612de9187857f55ee14a573f7f8e7d4ebc
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/mtd/davinci-nand.txt | 94 -------------
+ .../devicetree/bindings/mtd/ti,davinci-nand.yaml | 124 +++++++++++++++++
+ drivers/mtd/nand/onenand/onenand_base.c | 1 +
+ drivers/mtd/nand/raw/davinci_nand.c | 4 +
+ drivers/mtd/nand/spi/Makefile | 2 +-
+ drivers/mtd/nand/spi/core.c | 25 +++-
+ drivers/mtd/nand/spi/foresee.c | 10 ++
+ drivers/mtd/nand/spi/skyhigh.c | 147 +++++++++++++++++++++
+ include/linux/mtd/spinand.h | 2 +
+ 9 files changed, 309 insertions(+), 100 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/mtd/davinci-nand.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/ti,davinci-nand.yaml
+ create mode 100644 drivers/mtd/nand/spi/skyhigh.c
+Merging spi-nor/spi-nor/next (93e00ccab5f7 mtd: spi-nor: macronix: remove mx25u25635f from parts list to enable SFDP)
+$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 4 ++++
+ drivers/mtd/spi-nor/atmel.c | 4 ++++
+ drivers/mtd/spi-nor/core.c | 19 ++++++++++++-------
+ drivers/mtd/spi-nor/macronix.c | 9 ++-------
+ 4 files changed, 22 insertions(+), 14 deletions(-)
+Merging crypto/master (7fa481734016 crypto: ahash - make hash walk functions private to ahash.c)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master
+Auto-merging MAINTAINERS
+Auto-merging arch/loongarch/configs/loongson3_defconfig
+Auto-merging arch/m68k/configs/amiga_defconfig
+Auto-merging arch/m68k/configs/apollo_defconfig
+Auto-merging arch/m68k/configs/atari_defconfig
+Auto-merging arch/m68k/configs/bvme6000_defconfig
+Auto-merging arch/m68k/configs/hp300_defconfig
+Auto-merging arch/m68k/configs/mac_defconfig
+Auto-merging arch/m68k/configs/multi_defconfig
+Auto-merging arch/m68k/configs/mvme147_defconfig
+Auto-merging arch/m68k/configs/mvme16x_defconfig
+Auto-merging arch/m68k/configs/q40_defconfig
+Auto-merging arch/m68k/configs/sun3_defconfig
+Auto-merging arch/m68k/configs/sun3x_defconfig
+Auto-merging lib/rhashtable.c
+Merge made by the 'ort' strategy.
+ .../bindings/crypto/qcom,inline-crypto-engine.yaml | 1 +
+ .../devicetree/bindings/crypto/qcom,prng.yaml | 4 +
+ .../devicetree/bindings/crypto/qcom-qce.yaml | 1 +
+ Documentation/driver-api/crypto/iaa/iaa-crypto.rst | 9 +-
+ MAINTAINERS | 2 +-
+ arch/arm/configs/pxa_defconfig | 1 -
+ arch/loongarch/configs/loongson3_defconfig | 1 -
+ arch/m68k/configs/amiga_defconfig | 2 -
+ arch/m68k/configs/apollo_defconfig | 2 -
+ arch/m68k/configs/atari_defconfig | 2 -
+ arch/m68k/configs/bvme6000_defconfig | 2 -
+ arch/m68k/configs/hp300_defconfig | 2 -
+ arch/m68k/configs/mac_defconfig | 2 -
+ arch/m68k/configs/multi_defconfig | 2 -
+ arch/m68k/configs/mvme147_defconfig | 2 -
+ arch/m68k/configs/mvme16x_defconfig | 2 -
+ arch/m68k/configs/q40_defconfig | 2 -
+ arch/m68k/configs/sun3_defconfig | 2 -
+ arch/m68k/configs/sun3x_defconfig | 2 -
+ arch/mips/configs/bigsur_defconfig | 1 -
+ arch/mips/configs/decstation_64_defconfig | 2 -
+ arch/mips/configs/decstation_defconfig | 2 -
+ arch/mips/configs/decstation_r4k_defconfig | 2 -
+ arch/mips/configs/ip27_defconfig | 1 -
+ arch/mips/configs/ip30_defconfig | 1 -
+ arch/s390/configs/debug_defconfig | 2 -
+ arch/s390/configs/defconfig | 2 -
+ arch/x86/crypto/aegis128-aesni-glue.c | 1 -
+ arch/x86/crypto/aes-gcm-avx10-x86_64.S | 119 +-
+ arch/x86/crypto/aes-xts-avx-x86_64.S | 329 +--
+ arch/x86/crypto/aesni-intel_glue.c | 10 +-
+ arch/x86/crypto/blowfish_glue.c | 1 -
+ arch/x86/crypto/camellia_glue.c | 1 -
+ arch/x86/crypto/des3_ede_glue.c | 1 -
+ arch/x86/crypto/twofish_glue.c | 1 -
+ crypto/Kconfig | 18 -
+ crypto/Makefile | 2 -
+ crypto/aegis128-core.c | 2 -
+ crypto/ahash.c | 158 +-
+ crypto/algapi.c | 31 +-
+ crypto/anubis.c | 14 +-
+ crypto/aria_generic.c | 37 +-
+ crypto/fips.c | 4 +-
+ crypto/keywrap.c | 320 ---
+ crypto/khazad.c | 17 +-
+ crypto/seed.c | 48 +-
+ crypto/sig.c | 4 +-
+ crypto/skcipher.c | 185 +-
+ crypto/tcrypt.c | 4 -
+ crypto/tea.c | 83 +-
+ crypto/testmgr.c | 26 +-
+ crypto/testmgr.h | 192 --
+ crypto/vmac.c | 696 -------
+ drivers/crypto/Kconfig | 17 -
+ drivers/crypto/Makefile | 2 -
+ drivers/crypto/caam/blob_gen.c | 3 +-
+ drivers/crypto/ccp/dbc.c | 53 +-
+ drivers/crypto/hisilicon/hpre/hpre_main.c | 12 +
+ drivers/crypto/hisilicon/qm.c | 58 +-
+ drivers/crypto/hisilicon/sec2/sec.h | 3 +-
+ drivers/crypto/hisilicon/sec2/sec_crypto.c | 157 +-
+ drivers/crypto/hisilicon/sec2/sec_crypto.h | 11 -
+ drivers/crypto/hisilicon/sec2/sec_main.c | 12 +
+ drivers/crypto/hisilicon/zip/Makefile | 2 +-
+ drivers/crypto/hisilicon/zip/dae_main.c | 262 +++
+ drivers/crypto/hisilicon/zip/zip.h | 8 +
+ drivers/crypto/hisilicon/zip/zip_main.c | 51 +-
+ drivers/crypto/intel/iaa/iaa_crypto_main.c | 2 +-
+ drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c | 3 +
+ drivers/crypto/n2_asm.S | 96 -
+ drivers/crypto/n2_core.c | 2168 --------------------
+ drivers/crypto/n2_core.h | 232 ---
+ drivers/crypto/qce/aead.c | 2 +-
+ drivers/crypto/qce/core.c | 131 +-
+ drivers/crypto/qce/core.h | 9 +-
+ drivers/crypto/qce/dma.c | 22 +-
+ drivers/crypto/qce/dma.h | 3 +-
+ drivers/crypto/qce/sha.c | 2 +-
+ drivers/crypto/qce/skcipher.c | 2 +-
+ drivers/crypto/tegra/tegra-se-aes.c | 7 +-
+ drivers/crypto/tegra/tegra-se-hash.c | 7 +-
+ include/crypto/gf128mul.h | 6 +-
+ include/crypto/internal/hash.h | 23 -
+ include/crypto/internal/skcipher.h | 12 -
+ include/linux/hisi_acc_qm.h | 5 +
+ kernel/padata.c | 2 +-
+ lib/crypto/aesgcm.c | 2 +-
+ lib/crypto/gf128mul.c | 75 -
+ lib/rhashtable.c | 10 +-
+ 89 files changed, 1025 insertions(+), 4807 deletions(-)
+ delete mode 100644 crypto/keywrap.c
+ delete mode 100644 crypto/vmac.c
+ create mode 100644 drivers/crypto/hisilicon/zip/dae_main.c
+ delete mode 100644 drivers/crypto/n2_asm.S
+ delete mode 100644 drivers/crypto/n2_core.c
+ delete mode 100644 drivers/crypto/n2_core.h
+Merging drm/drm-next (d678c63534ed Merge tag 'drm-misc-next-2024-12-19' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next)
+$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/accel/habanalabs/common/habanalabs_drv.c
+Auto-merging drivers/accel/ivpu/ivpu_pm.c
+Auto-merging drivers/gpu/drm/Kconfig
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
+Auto-merging drivers/gpu/drm/drm_modes.c
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+Auto-merging drivers/gpu/drm/msm/dp/dp_audio.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c
+Auto-merging drivers/gpu/drm/xe/xe_bo.c
+Auto-merging drivers/gpu/drm/xe/xe_devcoredump.c
+Auto-merging drivers/gpu/drm/xe/xe_device.c
+Auto-merging drivers/gpu/drm/xe/xe_exec_queue.c
+Auto-merging drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c
+Auto-merging drivers/gpu/drm/xe/xe_oa.c
+Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_job.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/amdgpu_job.c'.
+[master d68c7bdef110] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/accel/amdxdna/amdnpu.rst | 281 +++++
+ Documentation/accel/amdxdna/index.rst | 11 +
+ Documentation/accel/index.rst | 1 +
+ .../bindings/display/brcm,bcm2711-hdmi.yaml | 2 +
+ .../bindings/display/brcm,bcm2835-hvs.yaml | 5 +-
+ .../bindings/display/brcm,bcm2835-pixelvalve0.yaml | 3 +
+ .../bindings/display/brcm,bcm2835-txp.yaml | 5 +-
+ .../bindings/display/brcm,bcm2835-vc4.yaml | 1 +
+ .../display/bridge/renesas,dsi-csi2-tx.yaml | 1 +
+ .../bindings/display/bridge/ti,sn65dsi83.yaml | 34 +-
+ .../bindings/display/panel/panel-lvds.yaml | 2 +
+ .../bindings/display/panel/panel-simple.yaml | 6 +
+ .../bindings/display/panel/samsung,atna33xc20.yaml | 2 +
+ .../devicetree/bindings/display/renesas,du.yaml | 67 +-
+ .../rockchip/rockchip,rk3588-mipi-dsi2.yaml | 120 ++
+ .../bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml | 10 +-
+ Documentation/gpu/drm-kms-helpers.rst | 3 +
+ Documentation/gpu/xe/index.rst | 1 +
+ Documentation/gpu/xe/xe_devcoredump.rst | 14 +
+ MAINTAINERS | 14 +-
+ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 7 +-
+ drivers/accel/Kconfig | 1 +
+ drivers/accel/Makefile | 1 +
+ drivers/accel/amdxdna/Kconfig | 18 +
+ drivers/accel/amdxdna/Makefile | 23 +
+ drivers/accel/amdxdna/TODO | 3 +
+ drivers/accel/amdxdna/aie2_ctx.c | 910 ++++++++++++++
+ drivers/accel/amdxdna/aie2_error.c | 360 ++++++
+ drivers/accel/amdxdna/aie2_message.c | 776 ++++++++++++
+ drivers/accel/amdxdna/aie2_msg_priv.h | 370 ++++++
+ drivers/accel/amdxdna/aie2_pci.c | 928 ++++++++++++++
+ drivers/accel/amdxdna/aie2_pci.h | 297 +++++
+ drivers/accel/amdxdna/aie2_pm.c | 108 ++
+ drivers/accel/amdxdna/aie2_psp.c | 146 +++
+ drivers/accel/amdxdna/aie2_smu.c | 134 ++
+ drivers/accel/amdxdna/aie2_solver.c | 380 ++++++
+ drivers/accel/amdxdna/aie2_solver.h | 155 +++
+ drivers/accel/amdxdna/amdxdna_ctx.c | 550 +++++++++
+ drivers/accel/amdxdna/amdxdna_ctx.h | 162 +++
+ drivers/accel/amdxdna/amdxdna_gem.c | 622 ++++++++++
+ drivers/accel/amdxdna/amdxdna_gem.h | 65 +
+ drivers/accel/amdxdna/amdxdna_mailbox.c | 561 +++++++++
+ drivers/accel/amdxdna/amdxdna_mailbox.h | 124 ++
+ drivers/accel/amdxdna/amdxdna_mailbox_helper.c | 61 +
+ drivers/accel/amdxdna/amdxdna_mailbox_helper.h | 42 +
+ drivers/accel/amdxdna/amdxdna_pci_drv.c | 429 +++++++
+ drivers/accel/amdxdna/amdxdna_pci_drv.h | 147 +++
+ drivers/accel/amdxdna/amdxdna_sysfs.c | 67 +
+ drivers/accel/amdxdna/npu1_regs.c | 114 ++
+ drivers/accel/amdxdna/npu2_regs.c | 113 ++
+ drivers/accel/amdxdna/npu4_regs.c | 134 ++
+ drivers/accel/amdxdna/npu5_regs.c | 113 ++
+ drivers/accel/amdxdna/npu6_regs.c | 114 ++
+ drivers/accel/habanalabs/common/habanalabs_drv.c | 1 -
+ drivers/accel/ivpu/ivpu_drv.c | 8 -
+ drivers/accel/ivpu/ivpu_pm.c | 2 +-
+ drivers/accel/qaic/qaic_drv.c | 1 -
+ drivers/accel/qaic/sahara.c | 3 +-
+ drivers/gpu/drm/Kconfig | 81 +-
+ drivers/gpu/drm/Makefile | 11 +-
+ drivers/gpu/drm/amd/amdgpu/Kconfig | 1 +
+ drivers/gpu/drm/amd/amdgpu/Makefile | 8 +-
+ drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 5 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 10 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 26 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 122 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 19 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 80 ++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 5 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 90 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 6 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 101 ++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 43 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 6 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 342 ++++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 15 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 77 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 21 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 4 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 21 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 81 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 31 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 113 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 21 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/cik.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/cik_ih.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/cz_ih.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 31 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 30 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 29 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 42 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 37 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v12_0.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 16 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 34 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 48 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 24 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 59 +-
+ drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/imu_v12_0.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 104 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 708 +++++++++++
+ drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.h | 29 +
+ drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 136 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c | 81 ++
+ drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/nv.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 12 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 116 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 343 ++---
+ drivers/gpu/drm/amd/amdgpu/si.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/si_dma.c | 10 +-
+ drivers/gpu/drm/amd/amdgpu/si_ih.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 34 +-
+ drivers/gpu/drm/amd/amdgpu/soc21.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/soc24.c | 27 +-
+ drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 3 +
+ drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h | 24 +-
+ drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 265 ++--
+ drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 17 +-
+ drivers/gpu/drm/amd/amdgpu/umc_v8_14.c | 160 +++
+ drivers/gpu/drm/amd/amdgpu/umc_v8_14.h | 51 +
+ drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 25 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 24 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 33 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 34 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 40 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 121 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 34 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 79 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.h | 5 +
+ drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c | 1118 +++++++++++++++++
+ drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.h | 29 +
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/vi.c | 6 +-
+ drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 491 ++++++++
+ .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 58 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_debug.h | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 135 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 3 +
+ .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 3 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_events.c | 11 +
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 2 +
+ drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 64 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 13 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 41 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 12 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 5 +-
+ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 13 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 10 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 22 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 5 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 46 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 8 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 325 ++++-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 25 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 37 +-
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 11 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 52 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 2 +-
+ drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 5 +-
+ .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 4 +-
+ .../amd/display/dc/clk_mgr/dcn35/dcn351_clk_mgr.c | 140 +++
+ .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 223 +++-
+ .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.h | 4 +
+ .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h | 41 +-
+ .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 46 +
+ .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.h | 1 +
+ .../dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.c | 23 +
+ .../dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.h | 3 +
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 21 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 11 -
+ drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 53 +-
+ drivers/gpu/drm/amd/display/dc/dc.h | 8 +-
+ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 37 +-
+ drivers/gpu/drm/amd/display/dc/dc_plane.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 17 +-
+ drivers/gpu/drm/amd/display/dc/dc_stream.h | 5 +-
+ .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 3 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 34 +-
+ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 3 +-
+ .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 34 +-
+ .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 132 --
+ .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 1 +
+ drivers/gpu/drm/amd/display/dc/dml2/Makefile | 15 +-
+ .../drm/amd/display/dc/dml2/display_mode_core.c | 41 +-
+ .../display/dc/dml2/display_mode_core_structs.h | 109 +-
+ .../drm/amd/display/dc/dml2/display_mode_util.c | 6 +-
+ .../dc/dml2/dml21/dml21_translation_helper.c | 16 +-
+ .../drm/amd/display/dc/dml2/dml21/dml21_utils.c | 76 +-
+ .../dc/dml2/dml21/inc/bounding_boxes/dcn4_soc_bb.h | 3 +-
+ .../dc/dml2/dml21/inc/dml_top_display_cfg_types.h | 52 +-
+ .../dml2/dml21/inc/dml_top_soc_parameter_types.h | 2 +
+ .../amd/display/dc/dml2/dml21/inc/dml_top_types.h | 77 +-
+ .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.c | 42 +-
+ .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 1305 +++++++++++++-------
+ .../dml21/src/dml2_core/dml2_core_dcn4_calcs.h | 2 +-
+ .../dml21/src/dml2_core/dml2_core_shared_types.h | 129 +-
+ .../dc/dml2/dml21/src/dml2_core/dml2_core_utils.c | 221 +++-
+ .../dc/dml2/dml21/src/dml2_core/dml2_core_utils.h | 6 +-
+ .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 49 +-
+ .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 392 +++---
+ .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.h | 7 +
+ .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.c | 1 -
+ .../dml2/dml21/src/dml2_top/dml2_top_interfaces.c | 51 +
+ .../dc/dml2/dml21/src/dml2_top/dml2_top_legacy.c | 4 +
+ .../dc/dml2/dml21/src/dml2_top/dml2_top_legacy.h | 9 +
+ .../dml21/src/dml2_top/dml2_top_optimization.c | 307 -----
+ .../dml21/src/dml2_top/dml2_top_optimization.h | 33 -
+ .../dc/dml2/dml21/src/dml2_top/dml2_top_soc15.c | 1177 ++++++++++++++++++
+ .../{dml_top_mcache.h => dml2_top_soc15.h} | 20 +-
+ .../dc/dml2/dml21/src/dml2_top/dml_top_mcache.c | 549 --------
+ .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.c | 5 +
+ .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.h | 46 +-
+ .../dml21/src/inc/dml2_internal_shared_types.h | 60 +-
+ .../amd/display/dc/dml2/dml2_translation_helper.c | 54 +-
+ drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 35 +-
+ .../amd/display/dc/dml2/dml_display_rq_dlg_calc.c | 12 -
+ .../gpu/drm/amd/display/dc/dwb/dcn30/dcn30_dwb.c | 13 -
+ .../gpu/drm/amd/display/dc/dwb/dcn30/dcn30_dwb.h | 1 -
+ .../gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.c | 15 +
+ .../gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.h | 2 +
+ .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.c | 15 +
+ .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h | 2 +
+ .../drm/amd/display/dc/hubp/dcn201/dcn201_hubp.c | 1 +
+ .../gpu/drm/amd/display/dc/hubp/dcn21/dcn21_hubp.c | 1 +
+ .../gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c | 17 +
+ .../gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.h | 2 +
+ .../gpu/drm/amd/display/dc/hubp/dcn31/dcn31_hubp.c | 1 +
+ .../gpu/drm/amd/display/dc/hubp/dcn32/dcn32_hubp.c | 3 +-
+ .../gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.c | 1 +
+ .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 35 +-
+ .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h | 25 +
+ .../gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c | 1 -
+ .../drm/amd/display/dc/hwss/dcn301/dcn301_init.c | 1 -
+ .../gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c | 3 +-
+ .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 12 +
+ .../drm/amd/display/dc/hwss/dcn314/dcn314_init.c | 3 +-
+ .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 1 +
+ .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 1 -
+ .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 12 +
+ .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 1 -
+ .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 1 -
+ .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 5 +-
+ .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 1 -
+ drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 4 -
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 6 +-
+ drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 4 -
+ .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 59 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 +
+ .../amd/display/dc/irq/dcn201/irq_service_dcn201.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 4 +
+ .../display/dc/link/protocols/link_dp_capability.c | 21 +-
+ .../gpu/drm/amd/display/dc/mpc/dcn30/dcn30_mpc.c | 18 +
+ .../gpu/drm/amd/display/dc/mpc/dcn30/dcn30_mpc.h | 7 +
+ .../drm/amd/display/dc/optc/dcn401/dcn401_optc.c | 4 +-
+ .../amd/display/dc/resource/dcn20/dcn20_resource.c | 57 +-
+ .../display/dc/resource/dcn201/dcn201_resource.c | 4 +-
+ .../display/dc/resource/dcn401/dcn401_resource.c | 4 +
+ drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 116 +-
+ drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h | 16 +-
+ drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 3 +
+ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 154 ++-
+ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 4 -
+ drivers/gpu/drm/amd/include/amd_shared.h | 4 +-
+ .../dcn/{dcn_2_0_3_offset.h => dcn_2_0_1_offset.h} | 4 +-
+ .../{dcn_2_0_3_sh_mask.h => dcn_2_0_1_sh_mask.h} | 4 +-
+ .../amd/include/asic_reg/umc/umc_8_14_0_offset.h | 29 +
+ .../amd/include/asic_reg/umc/umc_8_14_0_sh_mask.h | 37 +
+ drivers/gpu/drm/amd/include/atomfirmware.h | 17 +-
+ .../drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_5_0.h | 47 +
+ drivers/gpu/drm/amd/include/kgd_pp_interface.h | 4 +-
+ drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 108 +-
+ drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 4 +-
+ drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 8 +-
+ drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 7 +-
+ drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 8 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 2 +
+ .../drm/amd/pm/powerplay/hwmgr/vega10_powertune.c | 5 +-
+ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 86 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 8 +-
+ .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 3 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 3 +-
+ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 20 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 3 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 19 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 26 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 38 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 2 +-
+ drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 1 -
+ drivers/gpu/drm/arm/hdlcd_drv.c | 3 +-
+ drivers/gpu/drm/arm/malidp_drv.c | 3 +-
+ drivers/gpu/drm/armada/armada_drv.c | 3 +-
+ drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 3 +-
+ drivers/gpu/drm/ast/ast_drv.c | 3 +-
+ drivers/gpu/drm/ast/ast_drv.h | 1 -
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 3 +-
+ drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 2 +-
+ drivers/gpu/drm/bridge/analogix/anx7625.c | 4 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 28 -
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.h | 3 -
+ drivers/gpu/drm/bridge/chipone-icn6211.c | 2 +-
+ drivers/gpu/drm/bridge/chrontel-ch7033.c | 2 +-
+ drivers/gpu/drm/bridge/ite-it6263.c | 27 +-
+ drivers/gpu/drm/bridge/ite-it6505.c | 2 +-
+ drivers/gpu/drm/bridge/ite-it66121.c | 2 +
+ drivers/gpu/drm/bridge/lontium-lt8912b.c | 4 +-
+ drivers/gpu/drm/bridge/lontium-lt9211.c | 2 +-
+ drivers/gpu/drm/bridge/lontium-lt9611.c | 8 +-
+ drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 4 +-
+ .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 8 +-
+ drivers/gpu/drm/bridge/nxp-ptn3460.c | 4 +-
+ drivers/gpu/drm/bridge/sii902x.c | 4 +-
+ drivers/gpu/drm/bridge/sii9234.c | 4 +-
+ drivers/gpu/drm/bridge/sil-sii8620.c | 4 +-
+ drivers/gpu/drm/bridge/synopsys/Kconfig | 6 +
+ drivers/gpu/drm/bridge/synopsys/Makefile | 1 +
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 12 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h | 2 +-
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 1030 +++++++++++++++
+ drivers/gpu/drm/bridge/tc358767.c | 2 +-
+ drivers/gpu/drm/bridge/tc358768.c | 4 +-
+ drivers/gpu/drm/bridge/ti-dlpc3433.c | 2 +-
+ drivers/gpu/drm/bridge/ti-sn65dsi83.c | 149 ++-
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 6 +-
+ drivers/gpu/drm/bridge/ti-tfp410.c | 2 +-
+ drivers/gpu/drm/clients/Kconfig | 123 ++
+ drivers/gpu/drm/clients/Makefile | 8 +
+ .../gpu/drm/clients/drm_client_internal.h | 10 +-
+ drivers/gpu/drm/{ => clients}/drm_client_setup.c | 34 +-
+ drivers/gpu/drm/{ => clients}/drm_fbdev_client.c | 4 +-
+ drivers/gpu/drm/clients/drm_log.c | 420 +++++++
+ drivers/gpu/drm/display/drm_bridge_connector.c | 16 +-
+ drivers/gpu/drm/display/drm_dp_helper.c | 125 +-
+ drivers/gpu/drm/display/drm_dp_mst_topology.c | 90 +-
+ drivers/gpu/drm/display/drm_hdmi_state_helper.c | 29 +
+ drivers/gpu/drm/drm_connector.c | 169 ++-
+ drivers/gpu/drm/drm_draw.c | 233 ++++
+ drivers/gpu/drm/drm_draw_internal.h | 56 +
+ drivers/gpu/drm/drm_edid.c | 6 +
+ drivers/gpu/drm/drm_mode_config.c | 9 +
+ drivers/gpu/drm/drm_modes.c | 3 +-
+ drivers/gpu/drm/drm_of.c | 4 +-
+ drivers/gpu/drm/drm_panel.c | 1 +
+ drivers/gpu/drm/drm_panel_backlight_quirks.c | 94 ++
+ drivers/gpu/drm/drm_panic.c | 269 +---
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 -
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 3 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 +
+ drivers/gpu/drm/gma500/psb_drv.c | 3 +-
+ drivers/gpu/drm/gma500/psb_drv.h | 1 -
+ drivers/gpu/drm/gud/gud_drv.c | 3 +-
+ drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 3 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 -
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +-
+ drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 +-
+ drivers/gpu/drm/i2c/ch7006_drv.c | 2 +-
+ drivers/gpu/drm/i2c/sil164_drv.c | 2 +-
+ drivers/gpu/drm/i2c/tda9950.c | 4 +-
+ drivers/gpu/drm/i2c/tda998x_drv.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_audio.c | 3 +
+ drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 7 +
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 17 +-
+ drivers/gpu/drm/i915/display/intel_tc.c | 39 +-
+ drivers/gpu/drm/i915/gt/intel_engine.h | 3 -
+ .../gpu/drm/i915/gt/intel_execlists_submission.c | 9 -
+ drivers/gpu/drm/i915/gt/selftest_rps.c | 1 +
+ drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 12 +-
+ drivers/gpu/drm/i915/i915_driver.c | 1 -
+ drivers/gpu/drm/i915/i915_driver.h | 1 -
+ drivers/gpu/drm/i915/i915_gpu_error.c | 1 -
+ drivers/gpu/drm/i915/i915_mm.c | 4 +-
+ drivers/gpu/drm/i915/i915_pmu.c | 50 +-
+ drivers/gpu/drm/i915/i915_pmu.h | 4 +-
+ drivers/gpu/drm/imagination/pvr_drv.c | 1 -
+ drivers/gpu/drm/imagination/pvr_drv.h | 1 -
+ drivers/gpu/drm/imx/dcss/dcss-kms.c | 3 +-
+ drivers/gpu/drm/imx/ipuv3/imx-drm-core.c | 3 +-
+ drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 3 +-
+ drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 3 +-
+ drivers/gpu/drm/kmb/kmb_drv.c | 3 +-
+ drivers/gpu/drm/kmb/kmb_drv.h | 1 -
+ drivers/gpu/drm/lima/lima_drv.c | 1 -
+ drivers/gpu/drm/logicvc/logicvc_drm.c | 3 +-
+ drivers/gpu/drm/loongson/lsdc_drv.c | 10 +-
+ drivers/gpu/drm/mcde/mcde_drv.c | 3 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +-
+ drivers/gpu/drm/meson/meson_drv.c | 3 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.h | 1 -
+ drivers/gpu/drm/msm/dp/dp_audio.c | 2 +
+ drivers/gpu/drm/msm/msm_drv.c | 3 +-
+ drivers/gpu/drm/mxsfb/lcdif_drv.c | 3 +-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 3 +-
+ drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +-
+ drivers/gpu/drm/nouveau/include/nvif/log.h | 51 +
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 21 +
+ drivers/gpu/drm/nouveau/nouveau_debugfs.c | 16 +
+ drivers/gpu/drm/nouveau/nouveau_debugfs.h | 16 +
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 45 +-
+ drivers/gpu/drm/nouveau/nouveau_drv.h | 1 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 508 +++++++-
+ drivers/gpu/drm/omapdrm/omap_drv.c | 2 -
+ drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +-
+ drivers/gpu/drm/panel/panel-edp.c | 8 +
+ drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 1 +
+ .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 2 +-
+ drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 1 +
+ drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 1 +
+ drivers/gpu/drm/panel/panel-simple.c | 102 ++
+ drivers/gpu/drm/panel/panel-visionox-rm69299.c | 9 +-
+ drivers/gpu/drm/panfrost/panfrost_drv.c | 1 -
+ drivers/gpu/drm/panfrost/panfrost_gpu.c | 4 +
+ drivers/gpu/drm/panthor/panthor_devfreq.c | 12 +-
+ drivers/gpu/drm/panthor/panthor_devfreq.h | 4 +-
+ drivers/gpu/drm/panthor/panthor_device.c | 90 +-
+ drivers/gpu/drm/panthor/panthor_device.h | 37 +
+ drivers/gpu/drm/panthor/panthor_drv.c | 6 +-
+ drivers/gpu/drm/panthor/panthor_fw.c | 140 +--
+ drivers/gpu/drm/panthor/panthor_gpu.c | 23 +-
+ drivers/gpu/drm/panthor/panthor_mmu.c | 26 +-
+ drivers/gpu/drm/panthor/panthor_sched.c | 22 +-
+ drivers/gpu/drm/pl111/pl111_drv.c | 3 +-
+ drivers/gpu/drm/qxl/Kconfig | 1 +
+ drivers/gpu/drm/qxl/qxl_drv.c | 3 +-
+ drivers/gpu/drm/qxl/qxl_drv.h | 8 +-
+ drivers/gpu/drm/qxl/qxl_release.c | 68 +-
+ drivers/gpu/drm/radeon/Kconfig | 1 +
+ drivers/gpu/drm/radeon/radeon.h | 7 +-
+ drivers/gpu/drm/radeon/radeon_audio.c | 2 +
+ drivers/gpu/drm/radeon/radeon_cs.c | 45 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 3 +-
+ drivers/gpu/drm/radeon/radeon_drv.h | 1 -
+ drivers/gpu/drm/radeon/radeon_gem.c | 39 +-
+ drivers/gpu/drm/radeon/radeon_object.c | 25 +-
+ drivers/gpu/drm/radeon/radeon_object.h | 2 +-
+ drivers/gpu/drm/radeon/radeon_vm.c | 10 +-
+ drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 21 +-
+ drivers/gpu/drm/renesas/rcar-du/rcar_du_group.c | 24 +-
+ drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 4 +-
+ .../gpu/drm/renesas/rcar-du/rcar_mipi_dsi_regs.h | 1 -
+ drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c | 8 +-
+ drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 3 +-
+ drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c | 18 +
+ drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c | 6 +-
+ drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 3 +-
+ drivers/gpu/drm/rockchip/Kconfig | 10 +
+ drivers/gpu/drm/rockchip/Makefile | 1 +
+ drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.c | 11 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +-
+ drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +-
+ drivers/gpu/drm/rockchip/cdn-dp-reg.h | 2 +-
+ drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 2 +-
+ drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c | 487 ++++++++
+ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 +-
+ drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 147 ++-
+ drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +-
+ drivers/gpu/drm/rockchip/inno_hdmi.h | 2 +-
+ drivers/gpu/drm/rockchip/rk3066_hdmi.c | 2 +-
+ drivers/gpu/drm/rockchip/rk3066_hdmi.h | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 11 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_fb.h | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 581 ++++++++-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 28 +-
+ drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_lvds.h | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_rgb.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_rgb.h | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 219 +++-
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 2 +-
+ drivers/gpu/drm/solomon/ssd130x.c | 4 +-
+ drivers/gpu/drm/sprd/sprd_drm.c | 2 -
+ drivers/gpu/drm/sti/sti_drv.c | 4 +-
+ drivers/gpu/drm/sti/sti_hdmi.c | 2 +
+ drivers/gpu/drm/stm/drv.c | 3 +-
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +-
+ drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 32 +-
+ drivers/gpu/drm/tegra/drm.c | 4 +-
+ drivers/gpu/drm/tests/drm_connector_test.c | 463 +++++++
+ drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 409 ++++--
+ drivers/gpu/drm/tests/drm_kunit_edid.h | 102 ++
+ drivers/gpu/drm/tidss/tidss_dispc.c | 28 +-
+ drivers/gpu/drm/tidss/tidss_drv.c | 5 +-
+ drivers/gpu/drm/tidss/tidss_drv.h | 5 +-
+ drivers/gpu/drm/tidss/tidss_irq.c | 34 +-
+ drivers/gpu/drm/tidss/tidss_irq.h | 4 +-
+ drivers/gpu/drm/tidss/tidss_plane.c | 8 +
+ drivers/gpu/drm/tidss/tidss_plane.h | 2 +
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 3 +-
+ drivers/gpu/drm/tiny/Makefile | 2 +-
+ drivers/gpu/drm/tiny/arcpgu.c | 6 +-
+ drivers/gpu/drm/tiny/bochs.c | 3 +-
+ drivers/gpu/drm/tiny/{cirrus.c => cirrus-qemu.c} | 10 +-
+ drivers/gpu/drm/tiny/gm12u320.c | 4 +-
+ drivers/gpu/drm/tiny/hx8357d.c | 3 +-
+ drivers/gpu/drm/tiny/ili9163.c | 3 +-
+ drivers/gpu/drm/tiny/ili9225.c | 3 +-
+ drivers/gpu/drm/tiny/ili9341.c | 3 +-
+ drivers/gpu/drm/tiny/ili9486.c | 3 +-
+ drivers/gpu/drm/tiny/mi0283qt.c | 3 +-
+ drivers/gpu/drm/tiny/ofdrm.c | 4 +-
+ drivers/gpu/drm/tiny/panel-mipi-dbi.c | 4 +-
+ drivers/gpu/drm/tiny/repaper.c | 3 +-
+ drivers/gpu/drm/tiny/sharp-memory.c | 3 +-
+ drivers/gpu/drm/tiny/simpledrm.c | 4 +-
+ drivers/gpu/drm/tiny/st7586.c | 3 +-
+ drivers/gpu/drm/tiny/st7735r.c | 3 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 54 +-
+ drivers/gpu/drm/tve200/tve200_drv.c | 3 +-
+ drivers/gpu/drm/udl/udl_drv.c | 3 +-
+ drivers/gpu/drm/udl/udl_drv.h | 1 -
+ drivers/gpu/drm/v3d/v3d_bo.c | 4 -
+ drivers/gpu/drm/v3d/v3d_debugfs.c | 4 +-
+ drivers/gpu/drm/v3d/v3d_drv.c | 3 +-
+ drivers/gpu/drm/v3d/v3d_drv.h | 8 +
+ drivers/gpu/drm/v3d/v3d_mmu.c | 8 +-
+ drivers/gpu/drm/v3d/v3d_perfmon.c | 57 +-
+ drivers/gpu/drm/v3d/v3d_performance_counters.h | 12 +-
+ drivers/gpu/drm/v3d/v3d_regs.h | 29 +-
+ drivers/gpu/drm/v3d/v3d_sched.c | 26 +-
+ drivers/gpu/drm/v3d/v3d_submit.c | 19 +-
+ drivers/gpu/drm/vboxvideo/vbox_drv.c | 3 +-
+ drivers/gpu/drm/vboxvideo/vbox_drv.h | 1 -
+ drivers/gpu/drm/vc4/tests/vc4_mock.c | 8 +-
+ drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 106 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c | 96 +-
+ drivers/gpu/drm/vc4/vc4_drv.c | 24 +-
+ drivers/gpu/drm/vc4/vc4_drv.h | 54 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 116 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.h | 4 +
+ drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 640 ++++++++++
+ drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 217 ++++
+ drivers/gpu/drm/vc4/vc4_hvs.c | 737 ++++++++++-
+ drivers/gpu/drm/vc4/vc4_kms.c | 105 +-
+ drivers/gpu/drm/vc4/vc4_plane.c | 873 ++++++++++++-
+ drivers/gpu/drm/vc4/vc4_regs.h | 297 +++++
+ drivers/gpu/drm/vc4/vc4_txp.c | 91 +-
+ drivers/gpu/drm/vgem/vgem_drv.c | 2 -
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 4 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.h | 21 +-
+ drivers/gpu/drm/virtio/virtgpu_gem.c | 23 +-
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 6 +-
+ drivers/gpu/drm/virtio/virtgpu_object.c | 24 +
+ drivers/gpu/drm/virtio/virtgpu_plane.c | 125 +-
+ drivers/gpu/drm/virtio/virtgpu_prime.c | 178 ++-
+ drivers/gpu/drm/virtio/virtgpu_vq.c | 35 +
+ drivers/gpu/drm/vkms/vkms_composer.c | 310 ++++-
+ drivers/gpu/drm/vkms/vkms_crtc.c | 6 +-
+ drivers/gpu/drm/vkms/vkms_drv.c | 9 +-
+ drivers/gpu/drm/vkms/vkms_drv.h | 63 +-
+ drivers/gpu/drm/vkms/vkms_formats.c | 413 +++++--
+ drivers/gpu/drm/vkms/vkms_formats.h | 4 +-
+ drivers/gpu/drm/vkms/vkms_output.c | 49 +-
+ drivers/gpu/drm/vkms/vkms_plane.c | 19 +-
+ drivers/gpu/drm/vkms/vkms_writeback.c | 5 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 3 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 1 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 1 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 1 -
+ drivers/gpu/drm/xe/Makefile | 5 +-
+ drivers/gpu/drm/xe/abi/guc_actions_abi.h | 20 +
+ drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h | 38 +
+ drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 14 +
+ drivers/gpu/drm/xe/display/ext/i915_irq.c | 13 +-
+ drivers/gpu/drm/xe/display/intel_bo.c | 25 +-
+ drivers/gpu/drm/xe/display/xe_fb_pin.c | 12 +-
+ drivers/gpu/drm/xe/regs/xe_gt_regs.h | 2 +
+ drivers/gpu/drm/xe/regs/xe_oa_regs.h | 9 +-
+ drivers/gpu/drm/xe/regs/xe_pmt.h | 19 +
+ drivers/gpu/drm/xe/tests/xe_bo.c | 7 +
+ drivers/gpu/drm/xe/tests/xe_migrate.c | 13 +-
+ drivers/gpu/drm/xe/xe_assert.h | 8 +-
+ drivers/gpu/drm/xe/xe_bo.c | 182 ++-
+ drivers/gpu/drm/xe/xe_bo.h | 33 +-
+ drivers/gpu/drm/xe/xe_bo_evict.c | 14 +-
+ drivers/gpu/drm/xe/xe_bo_types.h | 6 +-
+ drivers/gpu/drm/xe/xe_devcoredump.c | 121 +-
+ drivers/gpu/drm/xe/xe_devcoredump.h | 7 +-
+ drivers/gpu/drm/xe/xe_devcoredump_types.h | 10 +-
+ drivers/gpu/drm/xe/xe_device.c | 9 +-
+ drivers/gpu/drm/xe/xe_device_types.h | 57 +-
+ drivers/gpu/drm/xe/xe_drm_client.c | 80 +-
+ drivers/gpu/drm/xe/xe_drv.h | 1 -
+ drivers/gpu/drm/xe/xe_exec_queue.c | 7 +
+ drivers/gpu/drm/xe/xe_ggtt.c | 35 +-
+ drivers/gpu/drm/xe/xe_gpu_scheduler.h | 10 +-
+ drivers/gpu/drm/xe/xe_gsc_proxy.c | 47 +-
+ drivers/gpu/drm/xe/xe_gt.c | 4 +-
+ drivers/gpu/drm/xe/xe_gt_pagefault.c | 1 -
+ drivers/gpu/drm/xe/xe_gt_printk.h | 31 +
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 78 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 3 +
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_config_types.h | 2 +
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 5 +
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_helpers.h | 2 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.c | 27 +-
+ drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 63 +
+ drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 2 +
+ drivers/gpu/drm/xe/xe_gt_stats.h | 8 +-
+ drivers/gpu/drm/xe/xe_gt_stats_types.h | 15 +
+ drivers/gpu/drm/xe/xe_gt_throttle.c | 2 +
+ drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 13 +-
+ drivers/gpu/drm/xe/xe_gt_types.h | 4 +-
+ drivers/gpu/drm/xe/xe_guc.c | 320 ++++-
+ drivers/gpu/drm/xe/xe_guc_ads.c | 11 +-
+ drivers/gpu/drm/xe/xe_guc_capture.c | 33 +-
+ drivers/gpu/drm/xe/xe_guc_capture.h | 6 +-
+ drivers/gpu/drm/xe/xe_guc_ct.c | 32 +-
+ drivers/gpu/drm/xe/xe_guc_fwif.h | 1 +
+ drivers/gpu/drm/xe/xe_guc_klv_helpers.c | 2 +
+ drivers/gpu/drm/xe/xe_guc_submit.c | 151 +--
+ drivers/gpu/drm/xe/xe_guc_types.h | 10 +
+ drivers/gpu/drm/xe/xe_heci_gsc.c | 8 +-
+ drivers/gpu/drm/xe/xe_hw_engine.c | 11 +-
+ drivers/gpu/drm/xe/xe_hw_engine.h | 4 +-
+ drivers/gpu/drm/xe/xe_hw_engine_types.h | 2 -
+ drivers/gpu/drm/xe/xe_irq.c | 37 +-
+ drivers/gpu/drm/xe/xe_lrc.c | 29 +
+ drivers/gpu/drm/xe/xe_lrc.h | 4 +
+ drivers/gpu/drm/xe/xe_macros.h | 12 +-
+ drivers/gpu/drm/xe/xe_memirq.c | 26 +-
+ drivers/gpu/drm/xe/xe_module.c | 2 +-
+ drivers/gpu/drm/xe/xe_oa.c | 55 +-
+ drivers/gpu/drm/xe/xe_oa_types.h | 2 +-
+ drivers/gpu/drm/xe/xe_pm.c | 3 -
+ drivers/gpu/drm/xe/xe_pt.c | 3 +
+ drivers/gpu/drm/xe/xe_query.c | 4 +-
+ drivers/gpu/drm/xe/xe_reg_sr.c | 53 -
+ drivers/gpu/drm/xe/xe_reg_whitelist.c | 37 +
+ drivers/gpu/drm/xe/xe_sriov.c | 4 +
+ drivers/gpu/drm/xe/xe_sriov_pf_helpers.h | 2 +-
+ drivers/gpu/drm/xe/xe_sriov_types.h | 17 +
+ drivers/gpu/drm/xe/xe_sriov_vf.c | 263 ++++
+ drivers/gpu/drm/xe/xe_sriov_vf.h | 14 +
+ drivers/gpu/drm/xe/xe_trace.h | 11 +-
+ drivers/gpu/drm/xe/xe_trace_bo.h | 5 +
+ drivers/gpu/drm/xe/xe_trace_lrc.c | 9 +
+ drivers/gpu/drm/xe/xe_trace_lrc.h | 52 +
+ drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 53 +-
+ drivers/gpu/drm/xe/xe_vm.c | 33 +-
+ drivers/gpu/drm/xe/xe_vm.h | 1 -
+ drivers/gpu/drm/xe/xe_vm_doc.h | 22 +-
+ drivers/gpu/drm/xe/xe_vsec.c | 233 ++++
+ drivers/gpu/drm/xe/xe_vsec.h | 11 +
+ drivers/gpu/drm/xe/xe_wa.c | 6 +
+ drivers/gpu/drm/xe/xe_wa_oob.rules | 1 +
+ drivers/gpu/drm/xen/xen_drm_front.c | 6 -
+ drivers/gpu/drm/xlnx/Kconfig | 9 +
+ drivers/gpu/drm/xlnx/Makefile | 1 +
+ drivers/gpu/drm/xlnx/zynqmp_disp.c | 48 -
+ drivers/gpu/drm/xlnx/zynqmp_disp_regs.h | 7 +-
+ drivers/gpu/drm/xlnx/zynqmp_dp.c | 56 +-
+ drivers/gpu/drm/xlnx/zynqmp_dp.h | 7 +
+ drivers/gpu/drm/xlnx/zynqmp_dp_audio.c | 447 +++++++
+ drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 39 +-
+ drivers/gpu/drm/xlnx/zynqmp_dpsub.h | 15 +-
+ drivers/gpu/drm/xlnx/zynqmp_kms.c | 3 +-
+ include/drm/bridge/dw_mipi_dsi2.h | 95 ++
+ include/drm/{ => clients}/drm_client_setup.h | 0
+ include/drm/display/drm_dp_helper.h | 5 +
+ include/drm/display/drm_hdmi_state_helper.h | 4 +
+ include/drm/drm_connector.h | 11 +-
+ include/drm/drm_drv.h | 2 -
+ include/drm/drm_utils.h | 4 +
+ include/drm/intel/xe_pciids.h | 235 ++++
+ include/drm/ttm/ttm_bo.h | 2 +
+ include/trace/events/amdxdna.h | 101 ++
+ include/uapi/drm/amdxdna_accel.h | 501 ++++++++
+ include/uapi/drm/panthor_drm.h | 9 +
+ include/uapi/drm/qaic_accel.h | 2 +-
+ include/uapi/drm/v3d_drm.h | 18 +
+ include/uapi/drm/xe_drm.h | 9 +
+ lib/fonts/Kconfig | 2 +-
+ 759 files changed, 33290 insertions(+), 6382 deletions(-)
+ create mode 100644 Documentation/accel/amdxdna/amdnpu.rst
+ create mode 100644 Documentation/accel/amdxdna/index.rst
+ create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-mipi-dsi2.yaml
+ create mode 100644 Documentation/gpu/xe/xe_devcoredump.rst
+ create mode 100644 drivers/accel/amdxdna/Kconfig
+ create mode 100644 drivers/accel/amdxdna/Makefile
+ create mode 100644 drivers/accel/amdxdna/TODO
+ create mode 100644 drivers/accel/amdxdna/aie2_ctx.c
+ create mode 100644 drivers/accel/amdxdna/aie2_error.c
+ create mode 100644 drivers/accel/amdxdna/aie2_message.c
+ create mode 100644 drivers/accel/amdxdna/aie2_msg_priv.h
+ create mode 100644 drivers/accel/amdxdna/aie2_pci.c
+ create mode 100644 drivers/accel/amdxdna/aie2_pci.h
+ create mode 100644 drivers/accel/amdxdna/aie2_pm.c
+ create mode 100644 drivers/accel/amdxdna/aie2_psp.c
+ create mode 100644 drivers/accel/amdxdna/aie2_smu.c
+ create mode 100644 drivers/accel/amdxdna/aie2_solver.c
+ create mode 100644 drivers/accel/amdxdna/aie2_solver.h
+ create mode 100644 drivers/accel/amdxdna/amdxdna_ctx.c
+ create mode 100644 drivers/accel/amdxdna/amdxdna_ctx.h
+ create mode 100644 drivers/accel/amdxdna/amdxdna_gem.c
+ create mode 100644 drivers/accel/amdxdna/amdxdna_gem.h
+ create mode 100644 drivers/accel/amdxdna/amdxdna_mailbox.c
+ create mode 100644 drivers/accel/amdxdna/amdxdna_mailbox.h
+ create mode 100644 drivers/accel/amdxdna/amdxdna_mailbox_helper.c
+ create mode 100644 drivers/accel/amdxdna/amdxdna_mailbox_helper.h
+ create mode 100644 drivers/accel/amdxdna/amdxdna_pci_drv.c
+ create mode 100644 drivers/accel/amdxdna/amdxdna_pci_drv.h
+ create mode 100644 drivers/accel/amdxdna/amdxdna_sysfs.c
+ create mode 100644 drivers/accel/amdxdna/npu1_regs.c
+ create mode 100644 drivers/accel/amdxdna/npu2_regs.c
+ create mode 100644 drivers/accel/amdxdna/npu4_regs.c
+ create mode 100644 drivers/accel/amdxdna/npu5_regs.c
+ create mode 100644 drivers/accel/amdxdna/npu6_regs.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v8_14.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v8_14.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn351_clk_mgr.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_interfaces.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_legacy.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_legacy.h
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_optimization.c
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_optimization.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.c
+ rename drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/{dml_top_mcache.h => dml2_top_soc15.h} (58%)
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml_top_mcache.c
+ rename drivers/gpu/drm/amd/include/asic_reg/dcn/{dcn_2_0_3_offset.h => dcn_2_0_1_offset.h} (99%)
+ rename drivers/gpu/drm/amd/include/asic_reg/dcn/{dcn_2_0_3_sh_mask.h => dcn_2_0_1_sh_mask.h} (99%)
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_14_0_offset.h
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_14_0_sh_mask.h
+ create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_5_0.h
+ create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c
+ create mode 100644 drivers/gpu/drm/clients/Kconfig
+ create mode 100644 drivers/gpu/drm/clients/Makefile
+ rename include/drm/drm_fbdev_client.h => drivers/gpu/drm/clients/drm_client_internal.h (62%)
+ rename drivers/gpu/drm/{ => clients}/drm_client_setup.c (72%)
+ rename drivers/gpu/drm/{ => clients}/drm_fbdev_client.c (98%)
+ create mode 100644 drivers/gpu/drm/clients/drm_log.c
+ create mode 100644 drivers/gpu/drm/drm_draw.c
+ create mode 100644 drivers/gpu/drm/drm_draw_internal.h
+ create mode 100644 drivers/gpu/drm/drm_panel_backlight_quirks.c
+ create mode 100644 drivers/gpu/drm/nouveau/include/nvif/log.h
+ create mode 100644 drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c
+ rename drivers/gpu/drm/tiny/{cirrus.c => cirrus-qemu.c} (99%)
+ create mode 100644 drivers/gpu/drm/xe/regs/xe_pmt.h
+ create mode 100644 drivers/gpu/drm/xe/xe_gt_stats_types.h
+ create mode 100644 drivers/gpu/drm/xe/xe_sriov_vf.c
+ create mode 100644 drivers/gpu/drm/xe/xe_sriov_vf.h
+ create mode 100644 drivers/gpu/drm/xe/xe_trace_lrc.c
+ create mode 100644 drivers/gpu/drm/xe/xe_trace_lrc.h
+ create mode 100644 drivers/gpu/drm/xe/xe_vsec.c
+ create mode 100644 drivers/gpu/drm/xe/xe_vsec.h
+ create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dp_audio.c
+ create mode 100644 include/drm/bridge/dw_mipi_dsi2.h
+ rename include/drm/{ => clients}/drm_client_setup.h (100%)
+ create mode 100644 include/drm/intel/xe_pciids.h
+ create mode 100644 include/trace/events/amdxdna.h
+ create mode 100644 include/uapi/drm/amdxdna_accel.h
+Merging drm-exynos/for-linux-next (31b2be07afd0 drm/exynos: Remove unnecessary checking)
+$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Merging drm-misc/for-linux-next (938fbb16aba8 drm/rockchip: vop2: Support 32x8 superblock afbc)
+$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+Auto-merging drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
+Auto-merging drivers/gpu/drm/xe/xe_drm_client.c
+Merge made by the 'ort' strategy.
+ .../bindings/display/panel/panel-simple.yaml | 2 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ Documentation/gpu/drm-usage-stats.rst | 54 ++--
+ MAINTAINERS | 3 +-
+ drivers/accel/amdxdna/aie2_ctx.c | 2 +-
+ drivers/accel/amdxdna/aie2_pci.c | 6 +-
+ drivers/accel/amdxdna/aie2_pci.h | 2 +-
+ drivers/accel/amdxdna/amdxdna_mailbox.c | 24 +-
+ drivers/accel/amdxdna/amdxdna_mailbox.h | 4 +-
+ drivers/accel/amdxdna/amdxdna_pci_drv.c | 2 +-
+ drivers/accel/amdxdna/npu1_regs.c | 2 +-
+ drivers/accel/amdxdna/npu2_regs.c | 2 +-
+ drivers/accel/amdxdna/npu4_regs.c | 2 +-
+ drivers/accel/amdxdna/npu5_regs.c | 2 +-
+ drivers/accel/amdxdna/npu6_regs.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 111 +++----
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 209 ++++++++++---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 26 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 1 +
+ drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 3 +-
+ drivers/gpu/drm/bridge/analogix/anx7625.c | 76 ++---
+ drivers/gpu/drm/bridge/ite-it6263.c | 10 -
+ drivers/gpu/drm/bridge/ite-it6505.c | 335 +++++++++++++++++----
+ drivers/gpu/drm/bridge/ite-it66121.c | 4 +-
+ drivers/gpu/drm/bridge/lontium-lt9611.c | 179 +++++------
+ drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 3 +-
+ drivers/gpu/drm/bridge/sii902x.c | 7 +-
+ .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 3 +-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 17 --
+ drivers/gpu/drm/display/Kconfig | 8 +
+ drivers/gpu/drm/display/Makefile | 2 +
+ drivers/gpu/drm/display/drm_bridge_connector.c | 151 +++++++++-
+ drivers/gpu/drm/display/drm_hdmi_audio_helper.c | 190 ++++++++++++
+ drivers/gpu/drm/display/drm_hdmi_state_helper.c | 57 ++++
+ drivers/gpu/drm/drm_connector.c | 5 +
+ drivers/gpu/drm/drm_file.c | 23 +-
+ drivers/gpu/drm/drm_panel.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +-
+ drivers/gpu/drm/hisilicon/hibmc/Makefile | 3 +-
+ drivers/gpu/drm/hisilicon/hibmc/dp/dp_aux.c | 164 ++++++++++
+ drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h | 63 ++++
+ drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h | 19 ++
+ drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c | 220 ++++++++++++++
+ drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 28 ++
+ drivers/gpu/drm/hisilicon/hibmc/dp/dp_link.c | 332 ++++++++++++++++++++
+ drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h | 76 +++++
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 118 ++++++++
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 14 +
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 19 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_i2c.c | 37 ++-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 20 +-
+ drivers/gpu/drm/i2c/tda998x_drv.c | 2 +-
+ drivers/gpu/drm/i915/i915_drm_client.c | 1 +
+ drivers/gpu/drm/mediatek/mtk_dp.c | 2 +-
+ drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +-
+ drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +-
+ drivers/gpu/drm/panel/panel-simple.c | 34 +++
+ drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 17 +-
+ drivers/gpu/drm/sti/sti_hdmi.c | 2 +-
+ drivers/gpu/drm/vc4/Kconfig | 1 +
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 104 ++-----
+ drivers/gpu/drm/vc4/vc4_hdmi.h | 2 -
+ drivers/gpu/drm/xe/xe_drm_client.c | 1 +
+ include/drm/display/drm_hdmi_audio_helper.h | 22 ++
+ include/drm/display/drm_hdmi_state_helper.h | 5 +
+ include/drm/drm_bridge.h | 74 +++++
+ include/drm/drm_connector.h | 132 ++++++++
+ include/drm/drm_file.h | 1 +
+ include/drm/drm_gem.h | 14 +-
+ include/sound/hdmi-codec.h | 7 +-
+ sound/soc/codecs/hdmi-codec.c | 4 +-
+ 78 files changed, 2514 insertions(+), 605 deletions(-)
+ create mode 100644 drivers/gpu/drm/display/drm_hdmi_audio_helper.c
+ create mode 100644 drivers/gpu/drm/hisilicon/hibmc/dp/dp_aux.c
+ create mode 100644 drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h
+ create mode 100644 drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h
+ create mode 100644 drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c
+ create mode 100644 drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h
+ create mode 100644 drivers/gpu/drm/hisilicon/hibmc/dp/dp_link.c
+ create mode 100644 drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h
+ create mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c
+ create mode 100644 include/drm/display/drm_hdmi_audio_helper.h
+Merging amdgpu/drm-next (a317017f47f6 drm/amd/display: Reapply fdedd77b0eb3)
+$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 35 ++--------------------
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_state.c | 8 ++---
+ drivers/gpu/drm/amd/display/dc/dc.h | 4 +--
+ drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/dc_types.h | 1 -
+ .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 2 +-
+ .../drm/amd/display/dc/dml2/dml2_mall_phantom.c | 2 +-
+ 8 files changed, 12 insertions(+), 44 deletions(-)
+Merging drm-intel/for-linux-next (60a43ecbd59d drm/i915/ddi: only call shutdown hooks for valid encoders)
+$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel/for-linux-next
+Auto-merging drivers/gpu/drm/i915/display/intel_audio.c
+Auto-merging drivers/gpu/drm/i915/display/intel_color.c
+Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy.c
+Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h
+Auto-merging drivers/gpu/drm/i915/display/intel_display_driver.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_driver.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c
+Auto-merging drivers/gpu/drm/i915/display/intel_dsb.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dsb.c
+Auto-merging drivers/gpu/drm/i915/display/intel_tc.c
+Auto-merging drivers/gpu/drm/i915/i915_driver.c
+Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c
+Auto-merging drivers/gpu/drm/xe/Makefile
+Auto-merging drivers/gpu/drm/xe/xe_pm.c
+Recorded preimage for 'drivers/gpu/drm/i915/display/intel_display_driver.c'
+Resolved 'drivers/gpu/drm/i915/display/intel_dp_mst.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/display/intel_dsb.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'drivers/gpu/drm/i915/display/intel_display_driver.c'.
+[master b5ef7554967c] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/drm_print.c | 23 +
+ drivers/gpu/drm/i915/Makefile | 5 +-
+ drivers/gpu/drm/i915/display/dvo_ns2501.c | 1 -
+ drivers/gpu/drm/i915/display/g4x_dp.c | 26 +-
+ drivers/gpu/drm/i915/display/g4x_dp.h | 6 -
+ drivers/gpu/drm/i915/display/g4x_hdmi.c | 36 +-
+ drivers/gpu/drm/i915/display/g4x_hdmi.h | 5 +-
+ drivers/gpu/drm/i915/display/hsw_ips.c | 20 +-
+ drivers/gpu/drm/i915/display/hsw_ips.h | 6 +-
+ drivers/gpu/drm/i915/display/i9xx_display_sr.c | 97 ++
+ drivers/gpu/drm/i915/display/i9xx_display_sr.h | 14 +
+ drivers/gpu/drm/i915/display/i9xx_plane.c | 1 +
+ drivers/gpu/drm/i915/display/i9xx_wm.c | 1 +
+ drivers/gpu/drm/i915/display/i9xx_wm_regs.h | 257 ++++
+ drivers/gpu/drm/i915/display/icl_dsi.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_acpi.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_atomic_plane.c | 28 +-
+ drivers/gpu/drm/i915/display/intel_audio.c | 54 +-
+ drivers/gpu/drm/i915/display/intel_audio.h | 1 +
+ drivers/gpu/drm/i915/display/intel_backlight.c | 1 +
+ drivers/gpu/drm/i915/display/intel_bios.c | 15 +-
+ drivers/gpu/drm/i915/display/intel_bios.h | 8 -
+ drivers/gpu/drm/i915/display/intel_bw.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 176 +--
+ drivers/gpu/drm/i915/display/intel_color.c | 1 +
+ drivers/gpu/drm/i915/display/intel_combo_phy.c | 1 +
+ drivers/gpu/drm/i915/display/intel_crt.c | 163 ++-
+ drivers/gpu/drm/i915/display/intel_crt_regs.h | 50 +
+ drivers/gpu/drm/i915/display/intel_crtc.c | 1 +
+ .../gpu/drm/i915/display/intel_crtc_state_dump.c | 14 +-
+ drivers/gpu/drm/i915/display/intel_cursor.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_cx0_phy.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 5 +
+ drivers/gpu/drm/i915/display/intel_ddi.c | 528 +++++----
+ drivers/gpu/drm/i915/display/intel_ddi.h | 12 +-
+ drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 23 +-
+ drivers/gpu/drm/i915/display/intel_de.h | 18 +-
+ drivers/gpu/drm/i915/display/intel_display.c | 117 +-
+ drivers/gpu/drm/i915/display/intel_display.h | 3 -
+ .../drm/i915/display/intel_display_conversion.c | 14 +
+ .../drm/i915/display/intel_display_conversion.h | 10 +-
+ drivers/gpu/drm/i915/display/intel_display_core.h | 17 +-
+ .../gpu/drm/i915/display/intel_display_debugfs.c | 11 +-
+ .../i915/display/intel_display_debugfs_params.c | 3 +-
+ .../gpu/drm/i915/display/intel_display_device.c | 278 +++--
+ .../gpu/drm/i915/display/intel_display_device.h | 155 +--
+ .../gpu/drm/i915/display/intel_display_driver.c | 297 ++---
+ .../gpu/drm/i915/display/intel_display_driver.h | 38 +-
+ drivers/gpu/drm/i915/display/intel_display_irq.c | 52 +-
+ .../gpu/drm/i915/display/intel_display_params.c | 13 +-
+ .../gpu/drm/i915/display/intel_display_params.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 948 +++++++--------
+ drivers/gpu/drm/i915/display/intel_display_power.h | 29 +-
+ .../gpu/drm/i915/display/intel_display_power_map.c | 62 +-
+ .../drm/i915/display/intel_display_power_well.c | 567 +++++----
+ .../drm/i915/display/intel_display_power_well.h | 35 +-
+ drivers/gpu/drm/i915/display/intel_display_reset.c | 4 +-
+ .../gpu/drm/i915/display/intel_display_snapshot.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_display_trace.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_display_types.h | 49 +-
+ drivers/gpu/drm/i915/display/intel_dmc.c | 4 -
+ drivers/gpu/drm/i915/display/intel_dmc_wl.c | 315 ++++-
+ drivers/gpu/drm/i915/display/intel_dmc_wl.h | 14 +-
+ drivers/gpu/drm/i915/display/intel_dp.c | 1231 ++++++++++----------
+ drivers/gpu/drm/i915/display/intel_dp.h | 41 +-
+ drivers/gpu/drm/i915/display/intel_dp_aux.c | 3 +-
+ .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 3 +-
+ .../gpu/drm/i915/display/intel_dp_link_training.c | 40 +-
+ drivers/gpu/drm/i915/display/intel_dp_mst.c | 722 ++++++------
+ drivers/gpu/drm/i915/display/intel_dp_test.c | 1 -
+ drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_dpio_phy.c | 8 +-
+ drivers/gpu/drm/i915/display/intel_dpll.c | 1 +
+ drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 1 +
+ drivers/gpu/drm/i915/display/intel_dpt.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_dpt_common.c | 1 +
+ drivers/gpu/drm/i915/display/intel_drrs.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_dsb.c | 58 +-
+ drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 20 +-
+ drivers/gpu/drm/i915/display/intel_dvo.c | 9 +-
+ drivers/gpu/drm/i915/display/intel_fdi.c | 1 +
+ drivers/gpu/drm/i915/display/intel_gmbus.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 36 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 19 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.h | 2 +-
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 4 +-
+ drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 6 +-
+ drivers/gpu/drm/i915/display/intel_hti.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_link_bw.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_load_detect.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_lspcon.c | 3 +-
+ drivers/gpu/drm/i915/display/intel_lvds.c | 49 +-
+ drivers/gpu/drm/i915/display/intel_modeset_setup.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_overlay.c | 184 +--
+ drivers/gpu/drm/i915/display/intel_overlay.h | 19 +-
+ drivers/gpu/drm/i915/display/intel_panel.c | 7 +-
+ drivers/gpu/drm/i915/display/intel_pch_display.c | 2 +
+ drivers/gpu/drm/i915/display/intel_pch_refclk.c | 27 +-
+ drivers/gpu/drm/i915/display/intel_pfit.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_pipe_crc.c | 1 +
+ drivers/gpu/drm/i915/display/intel_plane_initial.c | 56 +-
+ drivers/gpu/drm/i915/display/intel_plane_initial.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_pps.c | 174 +--
+ drivers/gpu/drm/i915/display/intel_psr.c | 88 +-
+ drivers/gpu/drm/i915/display/intel_quirks.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 12 +-
+ drivers/gpu/drm/i915/display/intel_snps_phy.c | 1 +
+ drivers/gpu/drm/i915/display/intel_tc.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_tv.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_vbt_defs.h | 8 +
+ drivers/gpu/drm/i915/display/intel_vdsc.c | 80 +-
+ drivers/gpu/drm/i915/display/intel_vdsc.h | 1 +
+ drivers/gpu/drm/i915/display/intel_vdsc_regs.h | 12 +-
+ drivers/gpu/drm/i915/display/intel_vrr.c | 3 +-
+ drivers/gpu/drm/i915/display/skl_scaler.c | 287 ++---
+ drivers/gpu/drm/i915/display/skl_scaler.h | 11 +-
+ drivers/gpu/drm/i915/display/skl_universal_plane.c | 51 +-
+ .../drm/i915/display/skl_universal_plane_regs.h | 15 +
+ drivers/gpu/drm/i915/display/skl_watermark.c | 857 ++++++++------
+ drivers/gpu/drm/i915/display/skl_watermark.h | 5 +
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 28 +-
+ drivers/gpu/drm/i915/display/vlv_dsi.h | 7 +-
+ drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 +-
+ drivers/gpu/drm/i915/gt/intel_ggtt.c | 19 +-
+ drivers/gpu/drm/i915/gt/intel_gtt.h | 4 +-
+ drivers/gpu/drm/i915/gt/intel_reset.c | 3 +-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 17 +-
+ drivers/gpu/drm/i915/gvt/display.c | 81 +-
+ drivers/gpu/drm/i915/gvt/fb_decoder.c | 21 +-
+ drivers/gpu/drm/i915/gvt/handlers.c | 45 +-
+ drivers/gpu/drm/i915/i915_driver.c | 132 ++-
+ drivers/gpu/drm/i915/i915_drv.h | 21 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +-
+ drivers/gpu/drm/i915/i915_getparam.c | 5 +-
+ drivers/gpu/drm/i915/i915_irq.c | 12 +-
+ drivers/gpu/drm/i915/i915_reg.h | 378 +-----
+ drivers/gpu/drm/i915/i915_suspend.c | 141 ---
+ drivers/gpu/drm/i915/i915_suspend.h | 14 -
+ drivers/gpu/drm/i915/i915_trace.h | 28 -
+ drivers/gpu/drm/i915/intel_cpu_info.c | 44 +
+ drivers/gpu/drm/i915/intel_cpu_info.h | 13 +
+ drivers/gpu/drm/i915/intel_device_info.c | 9 +
+ drivers/gpu/drm/i915/intel_device_info.h | 5 +-
+ drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 2 +
+ drivers/gpu/drm/i915/intel_sbi.c | 22 +-
+ drivers/gpu/drm/i915/intel_sbi.h | 4 +
+ drivers/gpu/drm/i915/intel_uncore.c | 7 +-
+ drivers/gpu/drm/i915/intel_uncore.h | 2 +
+ drivers/gpu/drm/i915/intel_uncore_trace.c | 7 +
+ drivers/gpu/drm/i915/intel_uncore_trace.h | 49 +
+ drivers/gpu/drm/i915/selftests/igt_flush_test.c | 12 +-
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +-
+ drivers/gpu/drm/i915/vlv_sideband.c | 28 +-
+ drivers/gpu/drm/i915/vlv_sideband.h | 3 +
+ drivers/gpu/drm/i915/vlv_suspend.c | 1 +
+ drivers/gpu/drm/xe/Makefile | 1 +
+ .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 16 +-
+ .../{i915_trace.h => intel_uncore_trace.h} | 0
+ drivers/gpu/drm/xe/display/xe_display.c | 116 +-
+ drivers/gpu/drm/xe/display/xe_display.h | 2 +
+ drivers/gpu/drm/xe/display/xe_plane_initial.c | 8 +-
+ drivers/gpu/drm/xe/xe_pm.c | 4 +-
+ include/drm/drm_print.h | 2 +
+ include/drm/intel/pciids.h | 55 +-
+ 164 files changed, 5666 insertions(+), 4569 deletions(-)
+ create mode 100644 drivers/gpu/drm/i915/display/i9xx_display_sr.c
+ create mode 100644 drivers/gpu/drm/i915/display/i9xx_display_sr.h
+ create mode 100644 drivers/gpu/drm/i915/display/i9xx_wm_regs.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_crt_regs.h
+ create mode 100644 drivers/gpu/drm/i915/display/intel_display_conversion.c
+ delete mode 100644 drivers/gpu/drm/i915/i915_suspend.c
+ delete mode 100644 drivers/gpu/drm/i915/i915_suspend.h
+ create mode 100644 drivers/gpu/drm/i915/intel_cpu_info.c
+ create mode 100644 drivers/gpu/drm/i915/intel_cpu_info.h
+ create mode 100644 drivers/gpu/drm/i915/intel_uncore_trace.c
+ create mode 100644 drivers/gpu/drm/i915/intel_uncore_trace.h
+ rename drivers/gpu/drm/xe/compat-i915-headers/{i915_trace.h => intel_uncore_trace.h} (100%)
+Merging drm-msm/msm-next (a5463629299b drm/msm/dpu: Add RM support for allocating CWB)
+$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next
+Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+Auto-merging drivers/gpu/drm/msm/dp/dp_audio.c
+Auto-merging drivers/gpu/drm/msm/dp/dp_display.c
+Auto-merging drivers/gpu/drm/msm/msm_mdss.c
+Merge made by the 'ort' strategy.
+ .../bindings/display/msm/dp-controller.yaml | 1 +
+ .../bindings/display/msm/dsi-controller-main.yaml | 2 +
+ .../bindings/display/msm/dsi-phy-14nm.yaml | 1 +
+ .../bindings/display/msm/qcom,sm6150-dpu.yaml | 108 ++++++
+ .../bindings/display/msm/qcom,sm6150-mdss.yaml | 245 +++++++++++++
+ drivers/gpu/drm/msm/Makefile | 1 +
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 10 +-
+ .../drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 31 +-
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h | 54 ++-
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 2 +
+ .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 2 +
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h | 254 ++++++++++++++
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 2 +
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 2 +
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 4 +-
+ .../drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 4 +-
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 6 +-
+ .../drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 6 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 63 ++++
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 1 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 14 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cwb.c | 75 ++++
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cwb.h | 70 ++++
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 13 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 4 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 50 ++-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 389 +++++++++++++++++----
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 13 +
+ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 175 ++++++---
+ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 18 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 2 +-
+ drivers/gpu/drm/msm/dp/dp_audio.c | 263 ++------------
+ drivers/gpu/drm/msm/dp/dp_audio.h | 3 -
+ drivers/gpu/drm/msm/dp/dp_catalog.c | 160 ++++-----
+ drivers/gpu/drm/msm/dp/dp_catalog.h | 35 +-
+ drivers/gpu/drm/msm/dp/dp_display.c | 11 +-
+ drivers/gpu/drm/msm/dp/dp_panel.c | 26 +-
+ drivers/gpu/drm/msm/dp/dp_panel.h | 11 +-
+ drivers/gpu/drm/msm/dsi/dsi_cfg.c | 2 +
+ drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 21 ++
+ drivers/gpu/drm/msm/msm_kms.c | 1 -
+ drivers/gpu/drm/msm/msm_mdss.c | 79 +++--
+ drivers/gpu/drm/msm/msm_mdss.h | 4 +-
+ drivers/gpu/drm/msm/registers/display/mdss.xml | 11 +-
+ 49 files changed, 1676 insertions(+), 583 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6150-dpu.yaml
+ create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6150-mdss.yaml
+ create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h
+ create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cwb.c
+ create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cwb.h
+Merging drm-msm-lumag/msm-next-lumag (a5463629299b drm/msm/dpu: Add RM support for allocating CWB)
+$ 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 (6acea03f98f5 drm/xe: Remove "graphics tile" from kernel doc)
+$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel drm-xe/drm-xe-next
+Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy.c
+Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h
+Auto-merging drivers/gpu/drm/xe/xe_device.c
+Auto-merging drivers/gpu/drm/xe/xe_exec_queue.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_exec_queue.c
+Auto-merging drivers/gpu/drm/xe/xe_oa.c
+Auto-merging drivers/gpu/drm/xe/xe_pm.c
+Recorded preimage for 'drivers/gpu/drm/xe/xe_exec_queue.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'drivers/gpu/drm/xe/xe_exec_queue.c'.
+[master cfc52a9e34ab] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/i915/display/intel_cx0_phy.c | 39 ++-
+ drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 4 +
+ drivers/gpu/drm/xe/regs/xe_engine_regs.h | 3 +
+ drivers/gpu/drm/xe/regs/xe_lrc_layout.h | 3 +
+ drivers/gpu/drm/xe/tests/xe_bo.c | 16 +-
+ drivers/gpu/drm/xe/tests/xe_live_test_mod.c | 2 +
+ drivers/gpu/drm/xe/xe_device.c | 4 +-
+ drivers/gpu/drm/xe/xe_device.h | 3 +-
+ drivers/gpu/drm/xe/xe_device_types.h | 8 +
+ drivers/gpu/drm/xe/xe_exec_queue.c | 16 +-
+ drivers/gpu/drm/xe/xe_exec_queue_types.h | 4 +-
+ drivers/gpu/drm/xe/xe_execlist.c | 10 +-
+ drivers/gpu/drm/xe/xe_gt.c | 8 +-
+ drivers/gpu/drm/xe/xe_gt_idle.c | 10 +-
+ drivers/gpu/drm/xe/xe_gt_stats.c | 4 +-
+ drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 16 +-
+ drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h | 3 +-
+ drivers/gpu/drm/xe/xe_guc.c | 30 +-
+ drivers/gpu/drm/xe/xe_hw_engine.c | 9 +-
+ drivers/gpu/drm/xe/xe_hw_engine_types.h | 2 +-
+ drivers/gpu/drm/xe/xe_hw_fence_types.h | 2 +-
+ drivers/gpu/drm/xe/xe_irq.c | 323 +++++++++++++++++++---
+ drivers/gpu/drm/xe/xe_irq.h | 8 +
+ drivers/gpu/drm/xe/xe_lrc.c | 24 +-
+ drivers/gpu/drm/xe/xe_lrc.h | 2 +-
+ drivers/gpu/drm/xe/xe_oa.c | 118 ++------
+ drivers/gpu/drm/xe/xe_oa_types.h | 6 +-
+ drivers/gpu/drm/xe/xe_pm.c | 4 +-
+ drivers/gpu/drm/xe/xe_query.c | 3 +-
+ drivers/gpu/drm/xe/xe_trace_bo.h | 12 +-
+ include/uapi/drm/xe_drm.h | 7 +
+ 31 files changed, 510 insertions(+), 193 deletions(-)
+$ git am -3 ../patches/0001-fix-up-for-drm-xe-ptl-Add-another-PTL-PCI-ID.patch
+Applying: fix up for "drm/xe/ptl: Add another PTL PCI ID"
+$ git reset HEAD^
+Unstaged changes after reset:
+M include/drm/intel/pciids.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 150eae50a160] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel
+ Date: Mon Jan 6 13:04:54 2025 +1100
+Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset support)
+$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 3 +--
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 12 +++++++++-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 28 ++++++++++++++++++++--
+ drivers/gpu/drm/etnaviv/etnaviv_gem.h | 2 --
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 41 ++++++++++++++++++++++++++++++++
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 ++
+ drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 26 +++++++++-----------
+ 7 files changed, 92 insertions(+), 22 deletions(-)
+Merging fbdev/for-next (bec73681d492 fbdev: omapfb: Remove unused hdmi5_core_handle_irqs)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next
+Merge made by the 'ort' strategy.
+ drivers/video/fbdev/aty/radeon_base.c | 8 +++----
+ drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 17 --------------
+ drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.h | 1 -
+ drivers/video/fbdev/udlfb.c | 8 +++----
+ drivers/video/hdmi.c | 28 -----------------------
+ include/linux/hdmi.h | 1 -
+ 6 files changed, 8 insertions(+), 55 deletions(-)
+Merging regmap/for-next (eb708cd631a8 regmap: regmap_multi_reg_read(): make register list const)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next
+Merge made by the 'ort' strategy.
+ drivers/base/regmap/regcache-maple.c | 7 +++----
+ drivers/base/regmap/regcache-rbtree.c | 10 ++++------
+ drivers/base/regmap/regcache.c | 2 +-
+ drivers/base/regmap/regmap.c | 13 ++++++-------
+ include/linux/regmap.h | 2 +-
+ 5 files changed, 15 insertions(+), 19 deletions(-)
+Merging sound/for-next (9001d5154435 ALSA: seq: Make dependency on UMP clearer)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next
+Auto-merging sound/core/seq/seq_clientmgr.c
+Merge made by the 'ort' strategy.
+ include/sound/pcm.h | 7 ++--
+ sound/core/memory.c | 41 ++++++++++++-------
+ sound/core/seq/Kconfig | 4 +-
+ sound/core/seq/oss/seq_oss_device.h | 1 -
+ sound/core/seq/oss/seq_oss_init.c | 2 +-
+ sound/core/seq/oss/seq_oss_synth.c | 80 +++++++------------------------------
+ sound/core/seq/seq_clientmgr.c | 7 ++++
+ sound/core/seq/seq_system.c | 25 +++++++++++-
+ sound/core/seq/seq_ump_client.c | 2 -
+ sound/pci/ac97/ac97_codec.c | 2 +-
+ sound/pci/ac97/ac97_proc.c | 8 ++--
+ sound/pci/ad1889.c | 8 ++--
+ sound/pci/cmipci.c | 2 +-
+ sound/pci/hda/hda_hwdep.c | 2 -
+ sound/pci/hda/hda_sysfs.c | 2 +-
+ sound/pci/hda/patch_realtek.c | 4 +-
+ sound/pci/lola/lola_clock.c | 2 +-
+ sound/pci/nm256/nm256.c | 8 +++-
+ sound/pci/rme32.c | 13 +++---
+ sound/pci/rme96.c | 13 +++---
+ sound/pci/rme9652/hdsp.c | 10 ++---
+ sound/pci/sonicvibes.c | 6 +--
+ sound/soc/qcom/lpass-platform.c | 6 ++-
+ 23 files changed, 124 insertions(+), 131 deletions(-)
+Merging ieee1394/for-next (ce4339d021c4 firewire: ohci: use generic power management)
+$ 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/ohci.c | 44 +++++++++++++-------------------------------
+ 1 file changed, 13 insertions(+), 31 deletions(-)
+Merging sound-asoc/for-next (f03669d2cd2d Merge remote-tracking branch 'asoc/for-6.14' into asoc-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next
+Auto-merging MAINTAINERS
+Auto-merging sound/soc/fsl/Kconfig
+Merge made by the 'ort' strategy.
+ .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 31 +
+ .../bindings/sound/mediatek,mt8188-mt6359.yaml | 16 +-
+ .../devicetree/bindings/sound/realtek,rt5682.yaml | 156 +
+ .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 19 +-
+ Documentation/devicetree/bindings/sound/rt5682.txt | 98 -
+ MAINTAINERS | 4 +-
+ drivers/firmware/cirrus/Kconfig | 20 +
+ drivers/firmware/cirrus/Makefile | 2 +
+ drivers/firmware/cirrus/test/Makefile | 23 +
+ drivers/firmware/cirrus/test/cs_dsp_mock_bin.c | 199 ++
+ .../firmware/cirrus/test/cs_dsp_mock_mem_maps.c | 752 +++++
+ drivers/firmware/cirrus/test/cs_dsp_mock_regmap.c | 367 +++
+ drivers/firmware/cirrus/test/cs_dsp_mock_utils.c | 13 +
+ drivers/firmware/cirrus/test/cs_dsp_mock_wmfw.c | 473 +++
+ drivers/firmware/cirrus/test/cs_dsp_test_bin.c | 2556 +++++++++++++++
+ .../firmware/cirrus/test/cs_dsp_test_bin_error.c | 600 ++++
+ .../firmware/cirrus/test/cs_dsp_test_callbacks.c | 688 ++++
+ .../cirrus/test/cs_dsp_test_control_cache.c | 3282 ++++++++++++++++++++
+ .../cirrus/test/cs_dsp_test_control_parse.c | 1851 +++++++++++
+ .../firmware/cirrus/test/cs_dsp_test_control_rw.c | 2669 ++++++++++++++++
+ drivers/firmware/cirrus/test/cs_dsp_test_wmfw.c | 2211 +++++++++++++
+ .../firmware/cirrus/test/cs_dsp_test_wmfw_error.c | 1347 ++++++++
+ drivers/firmware/cirrus/test/cs_dsp_tests.c | 14 +
+ include/dt-bindings/sound/qcom,wcd9335.h | 1 -
+ include/linux/firmware/cirrus/cs_dsp_test_utils.h | 160 +
+ include/sound/sdca.h | 7 +-
+ include/sound/sdca_function.h | 3 +
+ include/sound/soc_sdw_utils.h | 2 +
+ include/uapi/sound/compress_params.h | 23 +-
+ include/uapi/sound/sof/tokens.h | 2 +
+ sound/soc/amd/ps/pci-ps.c | 16 +-
+ sound/soc/codecs/Makefile | 8 +-
+ sound/soc/codecs/ad193x-i2c.c | 3 +-
+ sound/soc/codecs/adau1761-i2c.c | 5 +-
+ sound/soc/codecs/adau1781-i2c.c | 5 +-
+ sound/soc/codecs/adau1977-i2c.c | 5 +-
+ sound/soc/codecs/alc5623.c | 10 +-
+ sound/soc/codecs/alc5632.c | 6 +-
+ sound/soc/codecs/cs35l56.c | 8 +-
+ sound/soc/codecs/cs42l43.c | 2 +-
+ sound/soc/codecs/cs42l51-i2c.c | 6 +-
+ sound/soc/codecs/cs42l84.c | 2 +-
+ sound/soc/codecs/es8323.c | 2 +-
+ sound/soc/codecs/max98088.c | 4 +-
+ sound/soc/codecs/max98090.c | 18 +-
+ sound/soc/codecs/max98095.c | 4 +-
+ sound/soc/codecs/ntp8835.c | 2 +-
+ sound/soc/codecs/ntp8918.c | 2 +-
+ sound/soc/codecs/pcm186x-i2c.c | 3 +-
+ sound/soc/codecs/pcm6240.c | 3 +-
+ sound/soc/codecs/rt715-sdw.c | 41 -
+ sound/soc/codecs/rt715.h | 3 -
+ sound/soc/codecs/sma1307.c | 4 +-
+ sound/soc/codecs/ssm2602-i2c.c | 5 +-
+ sound/soc/codecs/tas2562.c | 4 +-
+ sound/soc/codecs/tas2781-i2c.c | 71 +-
+ sound/soc/codecs/tas5720.c | 10 +-
+ sound/soc/codecs/tlv320adc3xxx.c | 4 +-
+ sound/soc/codecs/tlv320aic31xx.c | 6 +-
+ sound/soc/codecs/tlv320aic3x-i2c.c | 3 +-
+ sound/soc/codecs/tpa6130a2.c | 4 +-
+ sound/soc/codecs/uda1342.c | 2 +-
+ sound/soc/codecs/wcd9335.c | 2 +
+ sound/soc/codecs/wm8904.c | 13 +-
+ sound/soc/codecs/wm8985.c | 4 +-
+ sound/soc/fsl/Kconfig | 2 +
+ sound/soc/fsl/Makefile | 2 +-
+ sound/soc/fsl/fsl_asrc.c | 179 +-
+ sound/soc/fsl/fsl_asrc.h | 2 +
+ sound/soc/fsl/fsl_asrc_common.h | 70 +
+ sound/soc/fsl/fsl_asrc_m2m.c | 727 +++++
+ sound/soc/fsl/fsl_easrc.c | 261 +-
+ sound/soc/fsl/fsl_easrc.h | 4 +
+ sound/soc/fsl/fsl_micfil.c | 33 +-
+ sound/soc/fsl/fsl_sai.c | 7 +-
+ sound/soc/fsl/fsl_sai.h | 3 +
+ sound/soc/fsl/fsl_utils.c | 45 +
+ sound/soc/fsl/fsl_utils.h | 5 +
+ sound/soc/fsl/fsl_xcvr.c | 404 ++-
+ sound/soc/fsl/fsl_xcvr.h | 13 +
+ sound/soc/generic/simple-card-utils.c | 70 +-
+ sound/soc/intel/boards/sof_sdw.c | 33 +-
+ sound/soc/intel/common/soc-acpi-intel-arl-match.c | 45 +-
+ sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 70 +
+ sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 289 +-
+ sound/soc/intel/common/soc-acpi-intel-ptl-match.c | 148 +
+ sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 194 ++
+ sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 19 +-
+ sound/soc/mediatek/mt8365/Makefile | 2 +-
+ sound/soc/mediatek/mt8365/mt8365-mt6357.c | 11 +-
+ sound/soc/qcom/sdm845.c | 5 +-
+ sound/soc/renesas/rz-ssi.c | 226 +-
+ sound/soc/rockchip/rockchip_i2s_tdm.c | 28 -
+ sound/soc/sdca/Makefile | 2 +-
+ sound/soc/sdca/sdca_device.c | 2 +
+ sound/soc/sdca/sdca_functions.c | 154 +-
+ sound/soc/sdw_utils/soc_sdw_cs_amp.c | 46 +
+ sound/soc/sdw_utils/soc_sdw_utils.c | 13 +-
+ sound/soc/soc-core.c | 1 +
+ sound/soc/soc-pcm.c | 32 +-
+ sound/soc/soc-topology.c | 8 +-
+ sound/soc/sof/intel/hda-dai.c | 12 +
+ sound/soc/sof/intel/hda-pcm.c | 15 +
+ sound/soc/sof/intel/hda.c | 5 +
+ sound/soc/sof/ipc4-topology.c | 2 +-
+ sound/soc/sof/sof-audio.h | 1 +
+ sound/soc/sof/sof-priv.h | 8 -
+ sound/soc/sof/topology.c | 4 +
+ sound/soc/sunxi/sun4i-codec.c | 367 ++-
+ sound/soc/sunxi/sun4i-spdif.c | 24 +-
+ 110 files changed, 20727 insertions(+), 745 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5682.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/rt5682.txt
+ create mode 100644 drivers/firmware/cirrus/test/Makefile
+ create mode 100644 drivers/firmware/cirrus/test/cs_dsp_mock_bin.c
+ create mode 100644 drivers/firmware/cirrus/test/cs_dsp_mock_mem_maps.c
+ create mode 100644 drivers/firmware/cirrus/test/cs_dsp_mock_regmap.c
+ create mode 100644 drivers/firmware/cirrus/test/cs_dsp_mock_utils.c
+ create mode 100644 drivers/firmware/cirrus/test/cs_dsp_mock_wmfw.c
+ create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_bin.c
+ create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_bin_error.c
+ create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_callbacks.c
+ create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_control_cache.c
+ create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_control_parse.c
+ create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_control_rw.c
+ create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_wmfw.c
+ create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_wmfw_error.c
+ create mode 100644 drivers/firmware/cirrus/test/cs_dsp_tests.c
+ create mode 100644 include/linux/firmware/cirrus/cs_dsp_test_utils.h
+ create mode 100644 sound/soc/fsl/fsl_asrc_m2m.c
+Merging modules/modules-next (8a231a18ec79 module: Constify 'struct module_attribute')
+$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next
+Auto-merging include/linux/module.h
+Auto-merging kernel/module/internal.h
+Auto-merging kernel/module/main.c
+Merge made by the 'ort' strategy.
+ include/linux/module.h | 10 ++++----
+ kernel/module/internal.h | 4 +--
+ kernel/module/main.c | 63 ++++++++++++++++++++++++++----------------------
+ kernel/module/sysfs.c | 4 +--
+ kernel/params.c | 22 ++++++++---------
+ 5 files changed, 54 insertions(+), 49 deletions(-)
+Merging input/next (21d8dd0daf4c Input: use guard notation in input core)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
+Merge made by the 'ort' strategy.
+ drivers/input/Kconfig | 14 --
+ drivers/input/Makefile | 1 -
+ drivers/input/evbug.c | 100 --------
+ drivers/input/ff-core.c | 91 +++----
+ drivers/input/ff-memless.c | 18 +-
+ drivers/input/input-mt.c | 34 +--
+ drivers/input/input-poller.c | 4 +-
+ drivers/input/input.c | 339 ++++++++++----------------
+ include/linux/platform_data/keyscan-davinci.h | 29 ---
+ 9 files changed, 186 insertions(+), 444 deletions(-)
+ delete mode 100644 drivers/input/evbug.c
+ delete mode 100644 include/linux/platform_data/keyscan-davinci.h
+Merging block/for-next (0188c28352ed Merge branch 'for-6.14/block' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next
+Auto-merging drivers/scsi/pm8001/pm8001_init.c
+Auto-merging fs/bcachefs/move.c
+Auto-merging include/linux/fs.h
+Auto-merging include/uapi/linux/fs.h
+Merge made by the 'ort' strategy.
+ arch/um/drivers/ubd_kern.c | 1 -
+ block/Makefile | 2 -
+ block/bfq-iosched.c | 2 +-
+ block/bio-integrity.c | 84 +++++--
+ block/bio.c | 107 +-------
+ block/blk-integrity.c | 10 +-
+ block/blk-map.c | 128 +++-------
+ block/blk-mq-cpumap.c | 37 +++
+ block/blk-mq-debugfs.c | 1 -
+ block/blk-mq-pci.c | 46 ----
+ block/blk-mq-sched.c | 3 +-
+ block/blk-mq-virtio.c | 46 ----
+ block/blk-mq.c | 14 +-
+ block/blk-zoned.c | 58 ++---
+ block/blk.h | 31 ++-
+ block/elevator.c | 15 +-
+ block/elevator.h | 2 +-
+ block/fops.c | 45 +++-
+ block/genhd.c | 29 ++-
+ block/kyber-iosched.c | 2 +-
+ block/mq-deadline.c | 2 +-
+ drivers/block/amiflop.c | 1 -
+ drivers/block/aoe/aoeblk.c | 1 -
+ drivers/block/ataflop.c | 1 -
+ drivers/block/floppy.c | 1 -
+ drivers/block/loop.c | 3 +-
+ drivers/block/mtip32xx/mtip32xx.c | 1 -
+ drivers/block/nbd.c | 3 +-
+ drivers/block/null_blk/main.c | 27 +-
+ drivers/block/null_blk/null_blk.h | 1 +
+ drivers/block/ps3disk.c | 7 +-
+ drivers/block/rbd.c | 1 -
+ drivers/block/rnbd/rnbd-clt.c | 3 +-
+ drivers/block/rnbd/rnbd-srv.c | 2 +-
+ drivers/block/rnull.rs | 30 ++-
+ drivers/block/sunvdc.c | 2 +-
+ drivers/block/swim.c | 2 +-
+ drivers/block/swim3.c | 3 +-
+ drivers/block/ublk_drv.c | 1 -
+ drivers/block/virtio_blk.c | 5 +-
+ drivers/block/xen-blkfront.c | 1 -
+ drivers/block/z2ram.c | 1 -
+ drivers/cdrom/gdrom.c | 2 +-
+ drivers/md/bcache/movinggc.c | 2 +-
+ drivers/md/bcache/writeback.c | 2 +-
+ drivers/md/dm-rq.c | 2 +-
+ drivers/md/dm-verity-fec.c | 6 +-
+ drivers/md/dm-verity-target.c | 4 +-
+ drivers/memstick/core/ms_block.c | 3 +-
+ drivers/memstick/core/mspro_block.c | 3 +-
+ drivers/mmc/core/queue.c | 2 +-
+ drivers/mtd/mtd_blkdevs.c | 2 +-
+ drivers/mtd/ubi/block.c | 2 +-
+ drivers/nvme/host/apple.c | 1 -
+ drivers/nvme/host/core.c | 22 +-
+ drivers/nvme/host/fc.c | 1 -
+ drivers/nvme/host/pci.c | 3 +-
+ drivers/nvme/target/passthru.c | 18 +-
+ drivers/nvme/target/zns.c | 3 +-
+ drivers/pci/pci-driver.c | 14 ++
+ drivers/s390/block/dasd_genhd.c | 1 -
+ drivers/s390/block/scm_blk.c | 1 -
+ drivers/scsi/fnic/fnic_main.c | 3 +-
+ drivers/scsi/hisi_sas/hisi_sas.h | 1 -
+ drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 4 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 3 +-
+ drivers/scsi/mpi3mr/mpi3mr.h | 1 -
+ drivers/scsi/mpi3mr/mpi3mr_os.c | 2 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 +-
+ drivers/scsi/pm8001/pm8001_init.c | 2 +-
+ drivers/scsi/pm8001/pm8001_sas.h | 1 -
+ drivers/scsi/qla2xxx/qla_nvme.c | 3 +-
+ drivers/scsi/qla2xxx/qla_os.c | 4 +-
+ drivers/scsi/scsi_lib.c | 1 -
+ drivers/scsi/sd.c | 4 +-
+ drivers/scsi/smartpqi/smartpqi_init.c | 7 +-
+ drivers/scsi/virtio_scsi.c | 3 +-
+ drivers/target/target_core_pscsi.c | 6 +-
+ drivers/virtio/virtio.c | 19 ++
+ fs/bcachefs/move.c | 6 +-
+ include/linux/bio-integrity.h | 25 +-
+ include/linux/bio.h | 5 -
+ include/linux/blk-mq-pci.h | 11 -
+ include/linux/blk-mq-virtio.h | 11 -
+ include/linux/blk-mq.h | 11 +-
+ include/linux/blkdev.h | 6 +
+ include/linux/device/bus.h | 3 +
+ include/linux/fs.h | 1 +
+ include/linux/io_uring_types.h | 26 +-
+ include/linux/uio.h | 9 +
+ include/uapi/linux/fs.h | 9 +
+ include/uapi/linux/io_uring.h | 16 ++
+ io_uring/alloc_cache.h | 13 +
+ io_uring/futex.c | 13 +-
+ io_uring/io_uring.c | 103 +++-----
+ io_uring/io_uring.h | 23 ++
+ io_uring/kbuf.c | 228 ++++++-----------
+ io_uring/kbuf.h | 20 +-
+ io_uring/memmap.c | 399 +++++++++++++++---------------
+ io_uring/memmap.h | 23 +-
+ io_uring/msg_ring.c | 7 -
+ io_uring/msg_ring.h | 1 -
+ io_uring/net.c | 35 +--
+ io_uring/poll.c | 13 +-
+ io_uring/register.c | 91 ++++---
+ io_uring/rsrc.c | 33 ++-
+ io_uring/rsrc.h | 4 +
+ io_uring/rw.c | 127 +++++++---
+ io_uring/rw.h | 14 +-
+ io_uring/timeout.c | 9 +-
+ io_uring/uring_cmd.c | 20 +-
+ io_uring/waitid.c | 4 +-
+ kernel/trace/blktrace.c | 36 +--
+ rust/kernel/block/mq/tag_set.rs | 2 +-
+ 114 files changed, 1066 insertions(+), 1214 deletions(-)
+ delete mode 100644 block/blk-mq-pci.c
+ delete mode 100644 block/blk-mq-virtio.c
+ delete mode 100644 include/linux/blk-mq-pci.h
+ delete mode 100644 include/linux/blk-mq-virtio.h
+Merging device-mapper/for-next (bab4d7a18e2a dm: change kzalloc to kcalloc)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next
+Merge made by the 'ort' strategy.
+ drivers/md/dm-ps-io-affinity.c | 2 +-
+ drivers/md/dm-raid.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging libata/for-next (7b64859fde26 ata: sata_gemini: Remove remaining reset glue)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next
+Merge made by the 'ort' strategy.
+ drivers/ata/ata_generic.c | 2 +-
+ drivers/ata/pata_atp867x.c | 2 +-
+ drivers/ata/pata_piccolo.c | 2 +-
+ drivers/ata/sata_gemini.c | 32 --------------------------------
+ drivers/ata/sata_gemini.h | 1 -
+ 5 files changed, 3 insertions(+), 36 deletions(-)
+Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros)
+$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next
+Already up to date.
+Merging mmc/next (741521fa273f mmc: sdhci-msm: convert to use custom crypto profile)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next
+Auto-merging Documentation/devicetree/bindings/crypto/qcom-qce.yaml
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/crypto/qcom-qce.yaml | 3 +-
+ .../bindings/mmc/amlogic,meson-mx-sdio.txt | 54 ----
+ .../bindings/mmc/amlogic,meson-mx-sdio.yaml | 94 ++++++
+ .../bindings/mmc/atmel,sama5d2-sdhci.yaml | 1 +
+ .../bindings/mmc/marvell,xenon-sdhci.yaml | 48 ++-
+ .../bindings/mmc/mmc-controller-common.yaml | 357 +++++++++++++++++++++
+ .../devicetree/bindings/mmc/mmc-controller.yaml | 346 +-------------------
+ .../devicetree/bindings/mmc/mmc-slot.yaml | 49 +++
+ Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 10 +-
+ .../devicetree/bindings/mmc/sdhci-msm.yaml | 3 +-
+ .../devicetree/bindings/net/qcom,ethqos.yaml | 3 +-
+ .../bindings/remoteproc/qcom,sm6115-pas.yaml | 3 +-
+ drivers/mmc/core/core.c | 7 +-
+ drivers/mmc/core/host.c | 1 -
+ drivers/mmc/core/sdio.c | 2 +
+ drivers/mmc/host/bcm2835.c | 20 ++
+ drivers/mmc/host/cqhci-crypto.c | 38 +--
+ drivers/mmc/host/cqhci.h | 8 +-
+ drivers/mmc/host/mtk-sd.c | 21 +-
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 2 -
+ drivers/mmc/host/rtsx_usb_sdmmc.c | 3 -
+ drivers/mmc/host/sdhci-acpi.c | 20 +-
+ drivers/mmc/host/sdhci-esdhc-imx.c | 1 +
+ drivers/mmc/host/sdhci-msm.c | 94 ++++--
+ drivers/mmc/host/tmio_mmc_core.c | 1 -
+ include/linux/mmc/core.h | 4 +-
+ include/linux/mmc/host.h | 8 +
+ 27 files changed, 691 insertions(+), 510 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdio.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdio.yaml
+ create mode 100644 Documentation/devicetree/bindings/mmc/mmc-controller-common.yaml
+ create mode 100644 Documentation/devicetree/bindings/mmc/mmc-slot.yaml
+Merging mfd/for-mfd-next (c2b148f3bc94 mfd: Add support for AAEON UP board FPGA)
+$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next
+Auto-merging Documentation/hwmon/index.rst
+Auto-merging MAINTAINERS
+Auto-merging drivers/hwmon/Kconfig
+Auto-merging drivers/mfd/cs42l43-i2c.c
+Auto-merging drivers/mfd/cs42l43-sdw.c
+Auto-merging drivers/mfd/cs42l43.c
+CONFLICT (content): Merge conflict in drivers/mfd/cs42l43.c
+Resolved 'drivers/mfd/cs42l43.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master debfc066e008] Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/mfd/qcom,tcsr.yaml | 1 +
+ .../devicetree/bindings/mfd/qnap,ts433-mcu.yaml | 42 +++
+ .../devicetree/bindings/mfd/rohm,bd71815-pmic.yaml | 20 +-
+ Documentation/hwmon/index.rst | 1 +
+ Documentation/hwmon/qnap-mcu-hwmon.rst | 27 ++
+ MAINTAINERS | 9 +
+ drivers/hid/hid-sensor-hub.c | 21 +-
+ drivers/hwmon/Kconfig | 12 +
+ drivers/hwmon/Makefile | 1 +
+ drivers/hwmon/qnap-mcu-hwmon.c | 364 +++++++++++++++++++++
+ drivers/input/misc/Kconfig | 12 +
+ drivers/input/misc/Makefile | 1 +
+ drivers/input/misc/qnap-mcu-input.c | 153 +++++++++
+ drivers/leds/Kconfig | 11 +
+ drivers/leds/Makefile | 1 +
+ drivers/leds/leds-qnap-mcu.c | 227 +++++++++++++
+ drivers/mfd/Kconfig | 25 ++
+ drivers/mfd/Makefile | 4 +
+ drivers/mfd/axp20x.c | 5 +-
+ drivers/mfd/cs42l43-i2c.c | 8 -
+ drivers/mfd/cs42l43-sdw.c | 10 -
+ drivers/mfd/cs42l43.c | 37 ++-
+ drivers/mfd/cs42l43.h | 1 -
+ drivers/mfd/da9052-core.c | 1 +
+ drivers/mfd/intel_soc_pmic_chtdc_ti.c | 2 +-
+ drivers/mfd/lpc_ich.c | 3 +-
+ drivers/mfd/qnap-mcu.c | 338 +++++++++++++++++++
+ drivers/mfd/stpmic1.c | 6 +-
+ drivers/mfd/upboard-fpga.c | 325 ++++++++++++++++++
+ include/linux/mfd/core.h | 2 +-
+ include/linux/mfd/da9052/da9052.h | 2 +
+ include/linux/mfd/qnap-mcu.h | 26 ++
+ include/linux/mfd/upboard-fpga.h | 55 ++++
+ 33 files changed, 1691 insertions(+), 62 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mfd/qnap,ts433-mcu.yaml
+ create mode 100644 Documentation/hwmon/qnap-mcu-hwmon.rst
+ create mode 100644 drivers/hwmon/qnap-mcu-hwmon.c
+ create mode 100644 drivers/input/misc/qnap-mcu-input.c
+ create mode 100644 drivers/leds/leds-qnap-mcu.c
+ create mode 100644 drivers/mfd/qnap-mcu.c
+ create mode 100644 drivers/mfd/upboard-fpga.c
+ create mode 100644 include/linux/mfd/qnap-mcu.h
+ create mode 100644 include/linux/mfd/upboard-fpga.h
+Merging backlight/for-backlight-next (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next
+Already up to date.
+Merging battery/for-next (a3a8799165ff platform/x86: dell-laptop: Use power_supply_charge_types_show/_parse() helpers)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next
+Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/power/supply/bq24190_charger.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-class-power | 29 +
+ .../bindings/power/reset/atmel,sama5d2-shdwc.yaml | 3 +
+ .../devicetree/bindings/power/supply/bq24190.yaml | 1 +
+ .../bindings/power/supply/gpio-charger.yaml | 6 +
+ .../bindings/power/supply/ltc4162-l.yaml | 6 +
+ .../bindings/power/supply/st,stc3117.yaml | 74 +++
+ .../devicetree/bindings/trivial-devices.yaml | 2 +
+ MAINTAINERS | 8 +
+ drivers/platform/x86/dell/dell-laptop.c | 54 +-
+ drivers/power/reset/Kconfig | 4 +-
+ drivers/power/reset/as3722-poweroff.c | 2 -
+ drivers/power/reset/at91-sama5d2_shdwc.c | 1 +
+ drivers/power/reset/gpio-poweroff.c | 8 +-
+ drivers/power/supply/Kconfig | 9 +
+ drivers/power/supply/Makefile | 1 +
+ drivers/power/supply/ab8500_btemp.c | 5 +-
+ drivers/power/supply/ab8500_chargalg.c | 5 +-
+ drivers/power/supply/ab8500_charger.c | 5 +-
+ drivers/power/supply/ab8500_fg.c | 33 +-
+ drivers/power/supply/apm_power.c | 6 +-
+ drivers/power/supply/bq2415x_charger.c | 36 +-
+ drivers/power/supply/bq24190_charger.c | 29 +-
+ drivers/power/supply/bq24257_charger.c | 8 +-
+ drivers/power/supply/bq27xxx_battery.c | 39 +-
+ drivers/power/supply/cros_charge-control.c | 208 ++++---
+ drivers/power/supply/ds2760_battery.c | 8 +-
+ drivers/power/supply/ds2780_battery.c | 24 +-
+ drivers/power/supply/ds2781_battery.c | 24 +-
+ drivers/power/supply/ds2782_battery.c | 87 ++-
+ drivers/power/supply/gpio-charger.c | 13 +
+ drivers/power/supply/ip5xxx_power.c | 572 +++++++++++++------
+ drivers/power/supply/ltc4162-l-charger.c | 432 +++++++++++++--
+ drivers/power/supply/max1720x_battery.c | 6 +
+ drivers/power/supply/mm8013.c | 2 +-
+ drivers/power/supply/olpc_battery.c | 11 +-
+ drivers/power/supply/power_supply.h | 31 ++
+ drivers/power/supply/power_supply_core.c | 266 +++++++--
+ drivers/power/supply/power_supply_hwmon.c | 48 +-
+ drivers/power/supply/power_supply_sysfs.c | 191 +++++--
+ drivers/power/supply/stc3117_fuel_gauge.c | 612 +++++++++++++++++++++
+ drivers/power/supply/surface_battery.c | 4 +-
+ drivers/power/supply/test_power.c | 113 ++++
+ drivers/power/supply/ug3105_battery.c | 4 -
+ include/linux/power/bq27xxx_battery.h | 1 +
+ include/linux/power_supply.h | 62 ++-
+ 45 files changed, 2466 insertions(+), 627 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/power/supply/st,stc3117.yaml
+ create mode 100644 drivers/power/supply/stc3117_fuel_gauge.c
+Merging regulator/for-next (8100d74e2ea1 Merge remote-tracking branch 'regulator/for-6.14' into regulator-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/regulator/mt6315-regulator.yaml | 6 -
+ .../bindings/regulator/nxp,pca9450-regulator.yaml | 1 +
+ drivers/regulator/bd96801-regulator.c | 130 ++++++++++++++++++---
+ drivers/regulator/pca9450-regulator.c | 111 ++++++++++--------
+ drivers/regulator/tps65219-regulator.c | 39 +------
+ include/linux/regulator/pca9450.h | 1 +
+ 6 files changed, 187 insertions(+), 101 deletions(-)
+Merging security/next (714d87c90a76 lockdown: initialize local array before use to quiet static analysis)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/nfsd/nfs4xdr.c
+Auto-merging kernel/auditsc.c
+Auto-merging net/ipv4/ip_sockglue.c
+Auto-merging security/selinux/hooks.c
+Merge made by the 'ort' strategy.
+ drivers/android/binder.c | 25 ++++----
+ fs/ceph/super.h | 3 +-
+ fs/ceph/xattr.c | 12 ++--
+ fs/fuse/dir.c | 35 +++++------
+ fs/nfs/nfs4proc.c | 22 ++++---
+ fs/nfsd/nfs4xdr.c | 22 ++++---
+ include/linux/lsm_audit.h | 14 +++++
+ include/linux/lsm_hook_defs.h | 13 ++---
+ include/linux/security.h | 37 +++++++-----
+ include/net/scm.h | 12 ++--
+ kernel/audit.c | 33 ++++++-----
+ kernel/auditsc.c | 27 ++++-----
+ net/ipv4/ip_sockglue.c | 12 ++--
+ net/netfilter/nf_conntrack_netlink.c | 20 +++----
+ net/netfilter/nf_conntrack_standalone.c | 11 ++--
+ net/netfilter/nfnetlink_queue.c | 26 +++++----
+ net/netlabel/netlabel_unlabeled.c | 44 ++++++--------
+ net/netlabel/netlabel_user.c | 10 ++--
+ rust/helpers/security.c | 8 +--
+ rust/kernel/security.rs | 38 ++++++------
+ security/Kconfig | 5 ++
+ security/Makefile | 2 +-
+ security/apparmor/include/secid.h | 7 +--
+ security/apparmor/secid.c | 34 ++++++-----
+ security/lockdown/lockdown.c | 2 +-
+ security/lsm_audit.c | 8 +--
+ security/safesetid/securityfs.c | 3 +
+ security/security.c | 67 ++++++++++------------
+ security/selinux/hooks.c | 49 +++++++++++-----
+ security/smack/smack_lsm.c | 52 ++++++++++-------
+ .../testing/selftests/lsm/lsm_set_self_attr_test.c | 7 +--
+ 31 files changed, 351 insertions(+), 309 deletions(-)
+Merging apparmor/apparmor-next (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next
+Already up to date.
+Merging integrity/next-integrity (4785ed362a24 ima: ignore suffixed policy rule comments)
+$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity
+Merge made by the 'ort' strategy.
+ security/integrity/ima/ima.h | 1 +
+ security/integrity/ima/ima_init.c | 2 ++
+ security/integrity/ima/ima_kexec.c | 3 ++-
+ security/integrity/ima/ima_policy.c | 5 +++--
+ security/integrity/ima/ima_queue.c | 44 +++++++++++++++++++++++++++++++++++++
+ 5 files changed, 52 insertions(+), 3 deletions(-)
+Merging selinux/next (bfbf0ee6c84f Automated merge of 'dev' into 'next')
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next
+Auto-merging include/linux/lsm_audit.h
+Auto-merging security/lsm_audit.c
+Auto-merging security/selinux/hooks.c
+Merge made by the 'ort' strategy.
+ include/linux/lsm_audit.h | 2 ++
+ security/lsm_audit.c | 3 ++
+ security/selinux/Makefile | 7 ++---
+ security/selinux/avc.c | 61 +++++++++++++++++++++----------------
+ security/selinux/hooks.c | 14 ++++-----
+ security/selinux/include/avc.h | 5 ++-
+ security/selinux/include/security.h | 6 +++-
+ security/selinux/selinuxfs.c | 2 +-
+ security/selinux/ss/avtab.c | 11 +++++--
+ security/selinux/ss/avtab.h | 2 +-
+ security/selinux/ss/conditional.c | 2 +-
+ security/selinux/ss/policydb.c | 5 +++
+ security/selinux/ss/services.c | 40 +++++++++++++++++-------
+ security/selinux/ss/sidtab.c | 4 +--
+ 14 files changed, 106 insertions(+), 58 deletions(-)
+Merging smack/next (6f71ad02aae8 smack: deduplicate access to string conversion)
+$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next
+Auto-merging security/smack/smack_lsm.c
+Merge made by the 'ort' strategy.
+ security/smack/smack.h | 1 +
+ security/smack/smack_access.c | 10 ++++++++--
+ security/smack/smack_lsm.c | 18 +-----------------
+ security/smack/smackfs.c | 26 +++++---------------------
+ 4 files changed, 15 insertions(+), 40 deletions(-)
+Merging tomoyo/master (dc46fafd6ecb tomoyo: automatically use patterns for several situations in learning mode)
+$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master
+Merge made by the 'ort' strategy.
+ security/tomoyo/common.c | 28 +++++++++++++++++++++++++++-
+ security/tomoyo/domain.c | 11 +++++++++--
+ 2 files changed, 36 insertions(+), 3 deletions(-)
+Merging tpmdd/next (2ba9f676d0a2 Merge tag 'drm-next-2024-11-29' of https://gitlab.freedesktop.org/drm/kernel)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next
+Already up to date.
+Merging watchdog/master (cc0dc9e871a9 watchdog: stm32_iwdg: fix error message during driver probe)
+$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master
+Already up to date.
+Merging iommu/next (d270bf624181 Merge branches 'arm/smmu/updates', 'arm/smmu/bindings', 'riscv', 'core' and 'amd/amd-vi' into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/iommu/arm,smmu.yaml | 23 +-
+ .../devicetree/bindings/iommu/qcom,iommu.yaml | 1 +
+ drivers/iommu/amd/amd_iommu.h | 4 +-
+ drivers/iommu/amd/amd_iommu_types.h | 41 ++-
+ drivers/iommu/amd/init.c | 229 ++++++------
+ drivers/iommu/amd/iommu.c | 390 +++++++++++++++------
+ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 15 +-
+ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 295 ++++++++++------
+ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 31 +-
+ drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 8 +-
+ drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 1 +
+ drivers/iommu/arm/arm-smmu/arm-smmu.c | 42 +--
+ drivers/iommu/intel/iommu.c | 15 +-
+ drivers/iommu/io-pgtable-arm.c | 73 ++--
+ drivers/iommu/iommu.c | 37 +-
+ drivers/iommu/of_iommu.c | 2 -
+ drivers/iommu/riscv/iommu-platform.c | 102 +++++-
+ include/linux/iommu.h | 5 -
+ 18 files changed, 896 insertions(+), 418 deletions(-)
+Merging audit/next (8bea8f86f7a1 Automated merge of 'dev' into 'next')
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next
+Merge made by the 'ort' strategy.
+ kernel/auditfilter.c | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+Merging devicetree/for-next (5b0417b8bb1b dt-bindings: mfd: mediatek: mt6397: Add bindings for MT6328)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml
+Auto-merging drivers/of/base.c
+Auto-merging drivers/of/fdt.c
+Auto-merging drivers/of/irq.c
+Auto-merging drivers/of/unittest.c
+Merge made by the 'ort' strategy.
+ .../bindings/input/mediatek,pmic-keys.yaml | 1 +
+ .../bindings/interrupt-controller/arm,gic.yaml | 4 +-
+ .../interrupt-controller/riscv,imsics.yaml | 2 +-
+ .../devicetree/bindings/mfd/mediatek,mt6397.yaml | 2 +
+ .../bindings/power/raspberrypi,bcm2835-power.yaml | 42 +++++++++++++++++++
+ .../bindings/soc/bcm/raspberrypi,bcm2835-power.txt | 47 ----------------------
+ .../devicetree/bindings/timer/fsl,imxgpt.yaml | 3 +-
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ Documentation/devicetree/of_unittest.rst | 12 +++---
+ .../translations/zh_CN/devicetree/of_unittest.rst | 2 +-
+ drivers/of/base.c | 16 +++-----
+ drivers/of/fdt.c | 16 ++------
+ drivers/of/fdt_address.c | 2 +-
+ drivers/of/irq.c | 2 +-
+ drivers/of/kobj.c | 4 +-
+ drivers/of/platform.c | 23 +++++------
+ drivers/of/unittest.c | 9 +++++
+ include/linux/of_platform.h | 2 -
+ 18 files changed, 92 insertions(+), 99 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/power/raspberrypi,bcm2835-power.yaml
+ delete mode 100644 Documentation/devicetree/bindings/soc/bcm/raspberrypi,bcm2835-power.txt
+Merging dt-krzk/for-next (dcdd69c1e196 Merge branch 'next/dt' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_socdk.dts | 6 ------
+ arch/arm/boot/dts/marvell/mmp2-olpc-xo-1-75.dts | 4 ++--
+ arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts | 2 +-
+ arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts | 2 +-
+ arch/arm64/boot/dts/sprd/sc2731.dtsi | 6 +++---
+ arch/arm64/boot/dts/sprd/sc9863a.dtsi | 14 +++++++-------
+ arch/arm64/boot/dts/sprd/sp9860g-1h10.dts | 9 +++++++--
+ 7 files changed, 21 insertions(+), 22 deletions(-)
+Merging mailbox/for-next (7f9e19f207be mailbox: pcc: Check before sending MCTP PCC response ACK)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next
+Already up to date.
+Merging spi/for-next (36e011f3e1b0 Merge remote-tracking branch 'spi/for-6.14' into spi-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/misc/lwn,bk4-spi.yaml | 54 ++
+ Documentation/devicetree/bindings/misc/lwn-bk4.txt | 26 -
+ .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 1 +
+ .../devicetree/bindings/spi/spi-controller.yaml | 25 +
+ drivers/spi/Kconfig | 12 +
+ drivers/spi/Makefile | 1 +
+ drivers/spi/atmel-quadspi.c | 956 +++++++++++++++++++--
+ drivers/spi/spi-cadence-quadspi.c | 49 +-
+ drivers/spi/spi-kspi2.c | 431 ++++++++++
+ drivers/spi/spi-mxs.c | 2 +
+ drivers/spi/spi-rockchip-sfc.c | 209 ++++-
+ drivers/spi/spi-sc18is602.c | 34 +-
+ drivers/spi/spi-zynq-qspi.c | 13 +-
+ drivers/spi/spi.c | 41 +-
+ drivers/spi/spidev.c | 30 +-
+ 15 files changed, 1690 insertions(+), 194 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/misc/lwn,bk4-spi.yaml
+ delete mode 100644 Documentation/devicetree/bindings/misc/lwn-bk4.txt
+ create mode 100644 drivers/spi/spi-kspi2.c
+Merging tip/master (af2c8596bd2e Merge branch into tip/master: 'x86/tdx')
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/coco/sev/core.c
+Auto-merging arch/x86/kernel/apic/io_apic.c
+Auto-merging arch/x86/kernel/paravirt.c
+Auto-merging drivers/idle/intel_idle.c
+Auto-merging include/linux/compiler.h
+Auto-merging include/linux/mm.h
+CONFLICT (content): Merge conflict in include/linux/mm.h
+Auto-merging include/linux/mm_types.h
+CONFLICT (content): Merge conflict in include/linux/mm_types.h
+Auto-merging include/linux/mmap_lock.h
+CONFLICT (content): Merge conflict in include/linux/mmap_lock.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/seqlock.h
+Auto-merging kernel/fork.c
+CONFLICT (content): Merge conflict in kernel/fork.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/trace/bpf_trace.c
+Auto-merging lib/Kconfig.debug
+Auto-merging mm/gup.c
+Auto-merging mm/init-mm.c
+CONFLICT (content): Merge conflict in mm/init-mm.c
+Auto-merging tools/testing/vma/vma.c
+Auto-merging tools/testing/vma/vma_internal.h
+CONFLICT (content): Merge conflict in tools/testing/vma/vma_internal.h
+Recorded preimage for 'include/linux/mm.h'
+Resolved 'include/linux/mm_types.h' using previous resolution.
+Resolved 'include/linux/mmap_lock.h' using previous resolution.
+Resolved 'kernel/fork.c' using previous resolution.
+Resolved 'mm/init-mm.c' using previous resolution.
+Recorded preimage for 'tools/testing/vma/vma_internal.h'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'include/linux/mm.h'.
+Recorded resolution for 'tools/testing/vma/vma_internal.h'.
+[master 63de830b03c9] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.rst | 3 -
+ Documentation/admin-guide/kernel-parameters.txt | 243 +++++++-
+ Documentation/arch/x86/amd-memory-encryption.rst | 118 ++++
+ Documentation/arch/x86/resctrl.rst | 10 +
+ Documentation/arch/x86/topology.rst | 4 +
+ Documentation/arch/x86/x86_64/boot-options.rst | 312 ----------
+ .../arch/x86/x86_64/fake-numa-for-cpusets.rst | 2 +-
+ Documentation/arch/x86/x86_64/index.rst | 1 -
+ Documentation/scheduler/sched-stats.rst | 128 ++--
+ MAINTAINERS | 7 +-
+ arch/arm/kernel/machine_kexec.c | 23 -
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/kernel/machine_kexec.c | 31 -
+ arch/loongarch/include/asm/bug.h | 13 +-
+ arch/powerpc/include/asm/kexec.h | 1 -
+ arch/powerpc/kexec/core.c | 22 -
+ arch/powerpc/kexec/core_32.c | 1 +
+ arch/riscv/kernel/machine_kexec.c | 23 -
+ arch/s390/kernel/perf_cpum_cf.c | 2 +-
+ arch/s390/kernel/perf_cpum_sf.c | 6 +-
+ arch/s390/kernel/perf_pai_crypto.c | 2 +-
+ arch/s390/kernel/perf_pai_ext.c | 2 +-
+ arch/x86/Kconfig | 2 +-
+ arch/x86/Kconfig.debug | 2 +-
+ arch/x86/boot/compressed/kaslr.c | 4 -
+ arch/x86/coco/sev/Makefile | 3 +
+ arch/x86/coco/sev/core.c | 15 +-
+ arch/x86/coco/sev/shared.c | 16 +-
+ arch/x86/coco/tdx/Makefile | 2 +-
+ arch/x86/coco/tdx/debug.c | 69 +++
+ arch/x86/coco/tdx/tdx.c | 44 +-
+ arch/x86/entry/entry_64.S | 9 +-
+ arch/x86/events/amd/core.c | 3 +-
+ arch/x86/events/amd/ibs.c | 64 +-
+ arch/x86/events/core.c | 3 +-
+ arch/x86/events/intel/core.c | 82 +--
+ arch/x86/events/intel/ds.c | 198 +++---
+ arch/x86/events/intel/pt.c | 5 +-
+ arch/x86/events/intel/pt.h | 3 -
+ arch/x86/events/perf_event.h | 1 +
+ arch/x86/events/rapl.c | 413 ++++++++-----
+ arch/x86/hyperv/ivm.c | 2 +-
+ arch/x86/include/asm/alternative.h | 22 +-
+ arch/x86/include/asm/amd_nb.h | 31 -
+ arch/x86/include/asm/bug.h | 2 +-
+ arch/x86/include/asm/cpu_device_id.h | 51 +-
+ arch/x86/include/asm/cpufeature.h | 18 +-
+ arch/x86/include/asm/cpufeatures.h | 19 +-
+ arch/x86/include/asm/cpuid.h | 7 +
+ arch/x86/include/asm/fpu/xstate.h | 4 -
+ arch/x86/include/asm/init.h | 2 +-
+ arch/x86/include/asm/irq_stack.h | 4 +-
+ arch/x86/include/asm/kexec.h | 30 +-
+ arch/x86/include/asm/mce.h | 6 +-
+ arch/x86/include/asm/mmu.h | 2 +
+ arch/x86/include/asm/mmu_context.h | 1 +
+ arch/x86/include/asm/msr-index.h | 8 +-
+ arch/x86/include/asm/mtrr.h | 10 +-
+ arch/x86/include/asm/mwait.h | 1 -
+ arch/x86/include/asm/nospec-branch.h | 18 -
+ arch/x86/include/asm/paravirt.h | 7 -
+ arch/x86/include/asm/paravirt_types.h | 2 -
+ arch/x86/include/asm/perf_event.h | 20 +-
+ arch/x86/include/asm/processor.h | 1 +
+ arch/x86/include/asm/sections.h | 1 +
+ arch/x86/include/asm/setup.h | 2 +-
+ arch/x86/include/asm/shared/tdx.h | 38 +-
+ arch/x86/include/asm/special_insns.h | 8 +-
+ arch/x86/include/asm/tdx.h | 3 +
+ arch/x86/include/asm/tlbflush.h | 1 +
+ arch/x86/include/asm/topology.h | 1 +
+ arch/x86/kernel/acpi/cstate.c | 5 +-
+ arch/x86/kernel/alternative.c | 10 +-
+ arch/x86/kernel/apic/apic.c | 27 +-
+ arch/x86/kernel/apic/io_apic.c | 2 +-
+ arch/x86/kernel/callthunks.c | 6 +
+ arch/x86/kernel/cpu/amd.c | 18 +-
+ arch/x86/kernel/cpu/bugs.c | 4 +
+ arch/x86/kernel/cpu/common.c | 86 +--
+ arch/x86/kernel/cpu/debugfs.c | 1 +
+ arch/x86/kernel/cpu/intel.c | 5 -
+ arch/x86/kernel/cpu/match.c | 30 +-
+ arch/x86/kernel/cpu/mce/amd.c | 137 +----
+ arch/x86/kernel/cpu/mce/core.c | 223 +++----
+ arch/x86/kernel/cpu/mce/genpool.c | 29 +-
+ arch/x86/kernel/cpu/mce/intel.c | 9 +-
+ arch/x86/kernel/cpu/mce/internal.h | 4 +-
+ arch/x86/kernel/cpu/mce/threshold.c | 2 +-
+ arch/x86/kernel/cpu/microcode/amd.c | 54 +-
+ arch/x86/kernel/cpu/mtrr/generic.c | 6 +-
+ arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +-
+ arch/x86/kernel/cpu/resctrl/core.c | 9 +-
+ arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 70 +++
+ arch/x86/kernel/cpu/resctrl/internal.h | 11 +-
+ arch/x86/kernel/cpu/resctrl/monitor.c | 94 ++-
+ arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 30 +-
+ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 43 +-
+ arch/x86/kernel/cpu/topology.c | 2 +-
+ arch/x86/kernel/cpu/topology_common.c | 1 +
+ arch/x86/kernel/fpu/xstate.c | 26 +-
+ arch/x86/kernel/head64.c | 40 +-
+ arch/x86/kernel/head_64.S | 12 +-
+ arch/x86/kernel/hpet.c | 6 +-
+ arch/x86/kernel/ksysfs.c | 18 +-
+ arch/x86/kernel/kvm.c | 2 +-
+ arch/x86/kernel/machine_kexec_64.c | 98 +--
+ arch/x86/kernel/paravirt.c | 6 -
+ arch/x86/kernel/pci-dma.c | 4 -
+ arch/x86/kernel/process.c | 9 +-
+ arch/x86/kernel/reboot.c | 2 +-
+ arch/x86/kernel/relocate_kernel_64.S | 158 +++--
+ arch/x86/kernel/smpboot.c | 5 +-
+ arch/x86/kernel/tsc.c | 23 +-
+ arch/x86/kernel/vmlinux.lds.S | 43 +-
+ arch/x86/kvm/cpuid.c | 2 +-
+ arch/x86/kvm/svm/sev.c | 2 +-
+ arch/x86/mm/fault.c | 3 +-
+ arch/x86/mm/ioremap.c | 119 ++--
+ arch/x86/mm/tlb.c | 59 +-
+ arch/x86/tools/relocs.c | 8 +-
+ arch/x86/virt/svm/sev.c | 667 ++++++++++++++++++---
+ arch/x86/virt/vmx/tdx/tdx.c | 97 +--
+ arch/x86/virt/vmx/tdx/tdx.h | 40 +-
+ arch/x86/virt/vmx/tdx/tdx_global_metadata.c | 48 ++
+ arch/x86/virt/vmx/tdx/tdx_global_metadata.h | 25 +
+ arch/x86/xen/enlighten_pv.c | 11 +-
+ drivers/acpi/acpi_pad.c | 5 +-
+ drivers/dma/ioat/dca.c | 8 +-
+ drivers/edac/i10nm_base.c | 21 +-
+ drivers/edac/skx_base.c | 2 +-
+ drivers/idle/intel_idle.c | 6 +-
+ drivers/platform/x86/intel/pmc/core.c | 7 +-
+ include/linux/compiler-gcc.h | 12 -
+ include/linux/compiler.h | 37 +-
+ include/linux/instrumentation.h | 11 +-
+ include/linux/irq.h | 3 +
+ include/linux/mm_types.h | 1 +
+ include/linux/mod_devicetable.h | 2 +
+ include/linux/objtool.h | 126 ++--
+ include/linux/objtool_types.h | 12 +
+ include/linux/perf_event.h | 32 +-
+ include/linux/sched.h | 10 +
+ include/linux/sched/isolation.h | 21 +-
+ include/linux/sched/topology.h | 13 +-
+ include/linux/sched/wake_q.h | 34 ++
+ include/linux/uprobes.h | 16 +-
+ kernel/events/core.c | 38 +-
+ kernel/events/uprobes.c | 225 +++++--
+ kernel/futex/pi.c | 5 +-
+ kernel/irq/Kconfig | 6 +
+ kernel/irq/Makefile | 2 +-
+ kernel/irq/kexec.c | 36 ++
+ kernel/irq/manage.c | 43 +-
+ kernel/locking/lockdep.c | 4 +-
+ kernel/locking/lockdep_internals.h | 3 +-
+ kernel/locking/mutex.c | 16 +-
+ kernel/locking/rtmutex.c | 32 +-
+ kernel/locking/test-ww_mutex.c | 9 +-
+ kernel/rseq.c | 98 +++
+ kernel/sched/core.c | 44 +-
+ kernel/sched/deadline.c | 119 +++-
+ kernel/sched/debug.c | 15 +-
+ kernel/sched/fair.c | 368 ++++++------
+ kernel/sched/features.h | 9 +
+ kernel/sched/isolation.c | 22 +-
+ kernel/sched/pelt.c | 4 +-
+ kernel/sched/sched.h | 22 +-
+ kernel/sched/stats.c | 11 +-
+ kernel/sched/topology.c | 12 +-
+ kernel/smp.c | 5 +-
+ kernel/trace/bpf_trace.c | 11 +-
+ lib/Kconfig.debug | 22 +-
+ mm/gup.c | 3 +-
+ rust/helpers/mutex.c | 5 +
+ rust/helpers/spinlock.c | 5 +
+ rust/kernel/sync.rs | 4 +-
+ rust/kernel/sync/lock.rs | 35 +-
+ rust/kernel/sync/lock/mutex.rs | 13 +
+ rust/kernel/sync/lock/spinlock.rs | 13 +
+ tools/include/linux/objtool_types.h | 12 +
+ tools/objtool/arch/loongarch/special.c | 3 +-
+ tools/objtool/arch/powerpc/special.c | 3 +-
+ tools/objtool/arch/x86/special.c | 4 +-
+ tools/objtool/check.c | 442 ++++----------
+ tools/objtool/include/objtool/check.h | 5 +-
+ tools/objtool/include/objtool/special.h | 3 +-
+ tools/testing/selftests/x86/lam.c | 2 +-
+ 187 files changed, 3874 insertions(+), 2906 deletions(-)
+ delete mode 100644 Documentation/arch/x86/x86_64/boot-options.rst
+ create mode 100644 arch/x86/coco/tdx/debug.c
+ create mode 100644 arch/x86/virt/vmx/tdx/tdx_global_metadata.c
+ create mode 100644 arch/x86/virt/vmx/tdx/tdx_global_metadata.h
+ create mode 100644 kernel/irq/kexec.c
+Merging clockevents/timers/drivers/next (08b97fbd13de clocksource/drivers/arm_arch_timer: Use of_property_present() for non-boolean properties)
+$ git merge -m Merge branch 'timers/drivers/next' of https://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next
+Already up to date.
+Merging edac/edac-for-next (36e45ffa7e61 Merge ras/edac-drivers into for-next)
+$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/edac/i10nm_base.c
+CONFLICT (content): Merge conflict in drivers/edac/i10nm_base.c
+Auto-merging drivers/edac/skx_base.c
+Resolved 'drivers/edac/i10nm_base.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 43815db9dd62] Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 6 ++
+ arch/loongarch/Kconfig | 1 +
+ drivers/edac/Kconfig | 8 +++
+ drivers/edac/Makefile | 1 +
+ drivers/edac/edac_mc.c | 2 +-
+ drivers/edac/edac_mc_sysfs.c | 6 +-
+ drivers/edac/i10nm_base.c | 12 ++--
+ drivers/edac/i5000_edac.c | 8 +--
+ drivers/edac/loongson_edac.c | 157 +++++++++++++++++++++++++++++++++++++++++++
+ drivers/edac/skx_base.c | 9 +--
+ drivers/edac/skx_common.c | 49 +++++++++-----
+ drivers/edac/skx_common.h | 3 +-
+ 12 files changed, 223 insertions(+), 39 deletions(-)
+ create mode 100644 drivers/edac/loongson_edac.c
+Merging ftrace/for-next (23c931b4d61d Merge tools/for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next
+Auto-merging kernel/trace/fgraph.c
+Auto-merging kernel/trace/ftrace.c
+Auto-merging kernel/trace/trace.c
+Auto-merging kernel/trace/trace_events.c
+Auto-merging kernel/trace/trace_kprobe.c
+Merge made by the 'ort' strategy.
+ arch/powerpc/kernel/trace/ftrace.c | 6 -
+ arch/powerpc/kernel/trace/ftrace_64_pg.c | 6 -
+ arch/x86/kernel/ftrace.c | 7 -
+ include/linux/jump_label.h | 3 +
+ include/linux/string.h | 3 +
+ include/linux/tracepoint.h | 20 +-
+ kernel/kprobes.c | 590 ++++++++++-----------
+ kernel/trace/fgraph.c | 8 +-
+ kernel/trace/ftrace.c | 134 ++---
+ kernel/trace/rv/Kconfig | 27 +-
+ kernel/trace/rv/Makefile | 3 +
+ kernel/trace/rv/monitors/wip/Kconfig | 12 +
+ kernel/trace/rv/monitors/wip/wip.c | 2 +-
+ kernel/trace/rv/monitors/wip/wip_trace.h | 15 +
+ kernel/trace/rv/monitors/wwnr/Kconfig | 11 +
+ kernel/trace/rv/monitors/wwnr/wwnr.c | 2 +-
+ kernel/trace/rv/monitors/wwnr/wwnr_trace.h | 16 +
+ kernel/trace/rv/rv.c | 2 +-
+ .../events/rv.h => kernel/trace/rv/rv_trace.h | 24 +-
+ kernel/trace/trace.c | 266 ++++------
+ kernel/trace/trace_dynevent.c | 23 +-
+ kernel/trace/trace_eprobe.c | 36 +-
+ kernel/trace/trace_events.c | 157 +++---
+ kernel/trace/trace_events_filter.c | 23 +-
+ kernel/trace/trace_events_hist.c | 32 +-
+ kernel/trace/trace_events_synth.c | 17 +-
+ kernel/trace/trace_events_trigger.c | 75 +--
+ kernel/trace/trace_functions_graph.c | 37 +-
+ kernel/trace/trace_kprobe.c | 18 +-
+ kernel/trace/trace_osnoise.c | 40 +-
+ kernel/trace/trace_stack.c | 6 +-
+ kernel/trace/trace_stat.c | 26 +-
+ kernel/trace/trace_uprobe.c | 15 +-
+ tools/verification/dot2/automata.py | 36 +-
+ tools/verification/dot2/dot2c.py | 4 +-
+ tools/verification/dot2/dot2k | 17 +-
+ tools/verification/dot2/dot2k.py | 226 ++++++--
+ tools/verification/dot2/dot2k_templates/Kconfig | 6 +
+ tools/verification/dot2/dot2k_templates/main.c | 91 ++++
+ .../dot2/dot2k_templates/main_global.c | 91 ----
+ .../dot2/dot2k_templates/main_per_cpu.c | 91 ----
+ .../dot2/dot2k_templates/main_per_task.c | 91 ----
+ tools/verification/dot2/dot2k_templates/trace.h | 13 +
+ 43 files changed, 1035 insertions(+), 1293 deletions(-)
+ create mode 100644 kernel/trace/rv/monitors/wip/Kconfig
+ create mode 100644 kernel/trace/rv/monitors/wip/wip_trace.h
+ create mode 100644 kernel/trace/rv/monitors/wwnr/Kconfig
+ create mode 100644 kernel/trace/rv/monitors/wwnr/wwnr_trace.h
+ rename include/trace/events/rv.h => kernel/trace/rv/rv_trace.h (79%)
+ create mode 100644 tools/verification/dot2/dot2k_templates/Kconfig
+ create mode 100644 tools/verification/dot2/dot2k_templates/main.c
+ delete mode 100644 tools/verification/dot2/dot2k_templates/main_global.c
+ delete mode 100644 tools/verification/dot2/dot2k_templates/main_per_cpu.c
+ delete mode 100644 tools/verification/dot2/dot2k_templates/main_per_task.c
+ create mode 100644 tools/verification/dot2/dot2k_templates/trace.h
+Merging rcu/next (4b5c2205526c Merge branches 'fixes.2024.12.14a', 'rcutorture.2024.12.14a', 'srcu.2024.12.14a' and 'torture-test.2024.12.14a' into rcu-merge.2024.12.14a)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git rcu/next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging kernel/rcu/tree.c
+CONFLICT (content): Merge conflict in kernel/rcu/tree.c
+Resolved 'kernel/rcu/tree.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 5173feb25118] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 90 +++++++-
+ MAINTAINERS | 10 +-
+ include/linux/rcupdate_wait.h | 11 +
+ include/linux/srcu.h | 21 +-
+ include/linux/srcutree.h | 8 +-
+ include/linux/torture.h | 2 +-
+ kernel/locking/locktorture.c | 6 +-
+ kernel/rcu/Kconfig.debug | 31 +++
+ kernel/rcu/rcutorture.c | 237 +++++++++++++++++----
+ kernel/rcu/refscale.c | 40 +++-
+ kernel/rcu/srcutree.c | 4 +-
+ kernel/rcu/tree.c | 3 +
+ kernel/rcu/tree_exp.h | 72 ++++---
+ kernel/rcu/tree_plugin.h | 1 +
+ kernel/rcu/update.c | 4 +-
+ .../testing/selftests/rcutorture/bin/kvm-remote.sh | 25 ++-
+ .../selftests/rcutorture/configs/rcu/TREE03.boot | 1 +
+ 17 files changed, 465 insertions(+), 101 deletions(-)
+Merging paulmck/non-rcu/next (b6f62437f431 Merge branches 'csd-lock.2024.10.11a', 'lkmm.2024.11.09a' and 'scftorture.2024.11.09a', tag 'nolibc.2024.11.01a' into HEAD)
+$ git merge -m Merge branch 'non-rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next
+Merge made by the 'ort' strategy.
+ .../Documentation/herd-representation.txt | 49 ++++---
+ tools/memory-model/README | 2 +-
+ tools/memory-model/linux-kernel.bell | 33 +++--
+ tools/memory-model/linux-kernel.cat | 10 ++
+ tools/memory-model/linux-kernel.cfg | 1 +
+ tools/memory-model/linux-kernel.def | 157 ++++++++++++---------
+ 6 files changed, 155 insertions(+), 97 deletions(-)
+Merging kvm/next (10b2c8a67c4b Merge tag 'kvm-x86-fixes-6.13-rcN' of https://github.com/kvm-x86/linux into HEAD)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 12 +-
+ arch/arm64/include/uapi/asm/kvm.h | 3 -
+ arch/riscv/include/uapi/asm/kvm.h | 3 -
+ include/uapi/linux/kvm.h | 4 +
+ tools/testing/selftests/kvm/.gitignore | 1 +
+ tools/testing/selftests/kvm/Makefile | 347 +--------------------
+ tools/testing/selftests/kvm/Makefile.kvm | 330 ++++++++++++++++++++
+ .../kvm/{aarch64 => arm64}/aarch32_id_regs.c | 10 +-
+ .../selftests/kvm/{aarch64 => arm64}/arch_timer.c | 0
+ .../kvm/{aarch64 => arm64}/arch_timer_edge_cases.c | 0
+ .../kvm/{aarch64 => arm64}/debug-exceptions.c | 4 +-
+ .../kvm/{aarch64 => arm64}/get-reg-list.c | 0
+ .../selftests/kvm/{aarch64 => arm64}/hypercalls.c | 6 +-
+ .../selftests/kvm/{aarch64 => arm64}/mmio_abort.c | 0
+ .../selftests/kvm/{aarch64 => arm64}/no-vgic-v3.c | 2 +-
+ .../kvm/{aarch64 => arm64}/page_fault_test.c | 0
+ .../selftests/kvm/{aarch64 => arm64}/psci_test.c | 8 +-
+ .../selftests/kvm/{aarch64 => arm64}/set_id_regs.c | 22 +-
+ .../kvm/{aarch64 => arm64}/smccc_filter.c | 0
+ .../kvm/{aarch64 => arm64}/vcpu_width_config.c | 0
+ .../selftests/kvm/{aarch64 => arm64}/vgic_init.c | 0
+ .../selftests/kvm/{aarch64 => arm64}/vgic_irq.c | 0
+ .../kvm/{aarch64 => arm64}/vgic_lpi_stress.c | 0
+ .../kvm/{aarch64 => arm64}/vpmu_counter_access.c | 19 +-
+ tools/testing/selftests/kvm/dirty_log_perf_test.c | 2 +-
+ .../kvm/include/{aarch64 => arm64}/arch_timer.h | 0
+ .../kvm/include/{aarch64 => arm64}/delay.h | 0
+ .../selftests/kvm/include/{aarch64 => arm64}/gic.h | 0
+ .../kvm/include/{aarch64 => arm64}/gic_v3.h | 0
+ .../kvm/include/{aarch64 => arm64}/gic_v3_its.h | 0
+ .../kvm/include/{aarch64 => arm64}/kvm_util_arch.h | 0
+ .../kvm/include/{aarch64 => arm64}/processor.h | 0
+ .../kvm/include/{aarch64 => arm64}/spinlock.h | 0
+ .../kvm/include/{aarch64 => arm64}/ucall.h | 0
+ .../kvm/include/{aarch64 => arm64}/vgic.h | 0
+ tools/testing/selftests/kvm/include/kvm_util.h | 10 +-
+ .../kvm/include/{s390x => s390}/debug_print.h | 0
+ .../include/{s390x => s390}/diag318_test_handler.h | 0
+ .../kvm/include/{s390x => s390}/facility.h | 0
+ .../kvm/include/{s390x => s390}/kvm_util_arch.h | 0
+ .../kvm/include/{s390x => s390}/processor.h | 0
+ .../selftests/kvm/include/{s390x => s390}/sie.h | 0
+ .../selftests/kvm/include/{s390x => s390}/ucall.h | 0
+ .../selftests/kvm/include/{x86_64 => x86}/apic.h | 2 -
+ .../selftests/kvm/include/{x86_64 => x86}/evmcs.h | 3 -
+ .../selftests/kvm/include/{x86_64 => x86}/hyperv.h | 3 -
+ .../kvm/include/{x86_64 => x86}/kvm_util_arch.h | 0
+ .../selftests/kvm/include/{x86_64 => x86}/mce.h | 2 -
+ .../selftests/kvm/include/{x86_64 => x86}/pmu.h | 0
+ .../kvm/include/{x86_64 => x86}/processor.h | 2 -
+ .../selftests/kvm/include/{x86_64 => x86}/sev.h | 0
+ .../selftests/kvm/include/{x86_64 => x86}/svm.h | 6 -
+ .../kvm/include/{x86_64 => x86}/svm_util.h | 3 -
+ .../selftests/kvm/include/{x86_64 => x86}/ucall.h | 0
+ .../selftests/kvm/include/{x86_64 => x86}/vmx.h | 2 -
+ .../selftests/kvm/lib/{aarch64 => arm64}/gic.c | 0
+ .../kvm/lib/{aarch64 => arm64}/gic_private.h | 0
+ .../selftests/kvm/lib/{aarch64 => arm64}/gic_v3.c | 0
+ .../kvm/lib/{aarch64 => arm64}/gic_v3_its.c | 0
+ .../kvm/lib/{aarch64 => arm64}/handlers.S | 0
+ .../kvm/lib/{aarch64 => arm64}/processor.c | 8 +-
+ .../kvm/lib/{aarch64 => arm64}/spinlock.c | 0
+ .../selftests/kvm/lib/{aarch64 => arm64}/ucall.c | 0
+ .../selftests/kvm/lib/{aarch64 => arm64}/vgic.c | 0
+ tools/testing/selftests/kvm/lib/kvm_util.c | 3 +-
+ tools/testing/selftests/kvm/lib/riscv/processor.c | 66 ++--
+ .../kvm/lib/{s390x => s390}/diag318_test_handler.c | 0
+ .../selftests/kvm/lib/{s390x => s390}/facility.c | 0
+ .../selftests/kvm/lib/{s390x => s390}/processor.c | 0
+ .../selftests/kvm/lib/{s390x => s390}/ucall.c | 0
+ .../selftests/kvm/lib/{x86_64 => x86}/apic.c | 0
+ .../selftests/kvm/lib/{x86_64 => x86}/handlers.S | 0
+ .../selftests/kvm/lib/{x86_64 => x86}/hyperv.c | 0
+ .../selftests/kvm/lib/{x86_64 => x86}/memstress.c | 2 +-
+ .../selftests/kvm/lib/{x86_64 => x86}/pmu.c | 0
+ .../selftests/kvm/lib/{x86_64 => x86}/processor.c | 2 -
+ .../selftests/kvm/lib/{x86_64 => x86}/sev.c | 0
+ .../selftests/kvm/lib/{x86_64 => x86}/svm.c | 1 -
+ .../selftests/kvm/lib/{x86_64 => x86}/ucall.c | 0
+ .../selftests/kvm/lib/{x86_64 => x86}/vmx.c | 2 -
+ .../{max_guest_memory_test.c => mmu_stress_test.c} | 162 +++++++++-
+ tools/testing/selftests/kvm/riscv/arch_timer.c | 2 +-
+ tools/testing/selftests/kvm/riscv/ebreak_test.c | 2 +-
+ tools/testing/selftests/kvm/riscv/sbi_pmu_test.c | 2 +-
+ .../selftests/kvm/{s390x => s390}/cmma_test.c | 0
+ tools/testing/selftests/kvm/{s390x => s390}/config | 0
+ .../kvm/{s390x => s390}/cpumodel_subfuncs_test.c | 0
+ .../selftests/kvm/{s390x => s390}/debug_test.c | 0
+ .../testing/selftests/kvm/{s390x => s390}/memop.c | 0
+ .../testing/selftests/kvm/{s390x => s390}/resets.c | 2 +-
+ .../kvm/{s390x => s390}/shared_zeropage_test.c | 0
+ .../selftests/kvm/{s390x => s390}/sync_regs_test.c | 0
+ .../testing/selftests/kvm/{s390x => s390}/tprot.c | 0
+ .../selftests/kvm/{s390x => s390}/ucontrol_test.c | 0
+ .../testing/selftests/kvm/set_memory_region_test.c | 6 +-
+ tools/testing/selftests/kvm/steal_time.c | 3 +-
+ .../selftests/kvm/{x86_64 => x86}/amx_test.c | 0
+ .../kvm/{x86_64 => x86}/apic_bus_clock_test.c | 0
+ .../selftests/kvm/{x86_64 => x86}/cpuid_test.c | 0
+ .../kvm/{x86_64 => x86}/cr4_cpuid_sync_test.c | 0
+ .../selftests/kvm/{x86_64 => x86}/debug_regs.c | 0
+ .../dirty_log_page_splitting_test.c | 0
+ .../exit_on_emulation_failure_test.c | 0
+ .../kvm/{x86_64 => x86}/feature_msrs_test.c | 0
+ .../kvm/{x86_64 => x86}/fix_hypercall_test.c | 0
+ .../selftests/kvm/{x86_64 => x86}/flds_emulation.h | 0
+ .../selftests/kvm/{x86_64 => x86}/hwcr_msr_test.c | 0
+ .../selftests/kvm/{x86_64 => x86}/hyperv_clock.c | 0
+ .../selftests/kvm/{x86_64 => x86}/hyperv_cpuid.c | 0
+ .../selftests/kvm/{x86_64 => x86}/hyperv_evmcs.c | 0
+ .../{x86_64 => x86}/hyperv_extended_hypercalls.c | 0
+ .../kvm/{x86_64 => x86}/hyperv_features.c | 0
+ .../selftests/kvm/{x86_64 => x86}/hyperv_ipi.c | 0
+ .../kvm/{x86_64 => x86}/hyperv_svm_test.c | 0
+ .../kvm/{x86_64 => x86}/hyperv_tlb_flush.c | 0
+ .../selftests/kvm/{x86_64 => x86}/kvm_clock_test.c | 0
+ .../selftests/kvm/{x86_64 => x86}/kvm_pv_test.c | 0
+ .../kvm/{x86_64 => x86}/max_vcpuid_cap_test.c | 0
+ .../kvm/{x86_64 => x86}/monitor_mwait_test.c | 0
+ .../kvm/{x86_64 => x86}/nested_exceptions_test.c | 0
+ .../kvm/{x86_64 => x86}/nx_huge_pages_test.c | 0
+ .../kvm/{x86_64 => x86}/nx_huge_pages_test.sh | 0
+ .../kvm/{x86_64 => x86}/platform_info_test.c | 0
+ .../kvm/{x86_64 => x86}/pmu_counters_test.c | 0
+ .../kvm/{x86_64 => x86}/pmu_event_filter_test.c | 0
+ .../{x86_64 => x86}/private_mem_conversions_test.c | 0
+ .../{x86_64 => x86}/private_mem_kvm_exits_test.c | 0
+ .../kvm/{x86_64 => x86}/recalc_apic_map_test.c | 0
+ .../kvm/{x86_64 => x86}/set_boot_cpu_id.c | 0
+ .../selftests/kvm/{x86_64 => x86}/set_sregs_test.c | 0
+ .../kvm/{x86_64 => x86}/sev_init2_tests.c | 0
+ .../kvm/{x86_64 => x86}/sev_migrate_tests.c | 0
+ .../selftests/kvm/{x86_64 => x86}/sev_smoke_test.c | 0
+ .../smaller_maxphyaddr_emulation_test.c | 0
+ .../selftests/kvm/{x86_64 => x86}/smm_test.c | 0
+ .../selftests/kvm/{x86_64 => x86}/state_test.c | 0
+ .../kvm/{x86_64 => x86}/svm_int_ctl_test.c | 0
+ .../kvm/{x86_64 => x86}/svm_nested_shutdown_test.c | 0
+ .../{x86_64 => x86}/svm_nested_soft_inject_test.c | 0
+ .../kvm/{x86_64 => x86}/svm_vmcall_test.c | 0
+ .../selftests/kvm/{x86_64 => x86}/sync_regs_test.c | 0
+ .../kvm/{x86_64 => x86}/triple_fault_event_test.c | 0
+ .../selftests/kvm/{x86_64 => x86}/tsc_msrs_test.c | 0
+ .../kvm/{x86_64 => x86}/tsc_scaling_sync.c | 0
+ .../kvm/{x86_64 => x86}/ucna_injection_test.c | 0
+ .../kvm/{x86_64 => x86}/userspace_io_test.c | 0
+ .../kvm/{x86_64 => x86}/userspace_msr_exit_test.c | 0
+ .../kvm/{x86_64 => x86}/vmx_apic_access_test.c | 0
+ .../{x86_64 => x86}/vmx_close_while_nested_test.c | 0
+ .../kvm/{x86_64 => x86}/vmx_dirty_log_test.c | 0
+ .../vmx_exception_with_invalid_guest_state.c | 0
+ .../vmx_invalid_nested_guest_state.c | 0
+ .../selftests/kvm/{x86_64 => x86}/vmx_msrs_test.c | 0
+ .../{x86_64 => x86}/vmx_nested_tsc_scaling_test.c | 0
+ .../kvm/{x86_64 => x86}/vmx_pmu_caps_test.c | 0
+ .../{x86_64 => x86}/vmx_preemption_timer_test.c | 0
+ .../{x86_64 => x86}/vmx_set_nested_state_test.c | 0
+ .../kvm/{x86_64 => x86}/vmx_tsc_adjust_test.c | 0
+ .../selftests/kvm/{x86_64 => x86}/xapic_ipi_test.c | 0
+ .../kvm/{x86_64 => x86}/xapic_state_test.c | 0
+ .../kvm/{x86_64 => x86}/xcr0_cpuid_test.c | 0
+ .../kvm/{x86_64 => x86}/xen_shinfo_test.c | 0
+ .../kvm/{x86_64 => x86}/xen_vmcall_test.c | 0
+ .../selftests/kvm/{x86_64 => x86}/xss_msr_test.c | 0
+ 164 files changed, 588 insertions(+), 481 deletions(-)
+ create mode 100644 tools/testing/selftests/kvm/Makefile.kvm
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/aarch32_id_regs.c (95%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/arch_timer.c (100%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/arch_timer_edge_cases.c (100%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/debug-exceptions.c (99%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/get-reg-list.c (100%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/hypercalls.c (98%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/mmio_abort.c (100%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/no-vgic-v3.c (98%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/page_fault_test.c (100%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/psci_test.c (96%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/set_id_regs.c (97%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/smccc_filter.c (100%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/vcpu_width_config.c (100%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/vgic_init.c (100%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/vgic_irq.c (100%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/vgic_lpi_stress.c (100%)
+ rename tools/testing/selftests/kvm/{aarch64 => arm64}/vpmu_counter_access.c (97%)
+ rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/arch_timer.h (100%)
+ rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/delay.h (100%)
+ rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/gic.h (100%)
+ rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/gic_v3.h (100%)
+ rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/gic_v3_its.h (100%)
+ rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/kvm_util_arch.h (100%)
+ rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/processor.h (100%)
+ rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/spinlock.h (100%)
+ rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/ucall.h (100%)
+ rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/vgic.h (100%)
+ rename tools/testing/selftests/kvm/include/{s390x => s390}/debug_print.h (100%)
+ rename tools/testing/selftests/kvm/include/{s390x => s390}/diag318_test_handler.h (100%)
+ rename tools/testing/selftests/kvm/include/{s390x => s390}/facility.h (100%)
+ rename tools/testing/selftests/kvm/include/{s390x => s390}/kvm_util_arch.h (100%)
+ rename tools/testing/selftests/kvm/include/{s390x => s390}/processor.h (100%)
+ rename tools/testing/selftests/kvm/include/{s390x => s390}/sie.h (100%)
+ rename tools/testing/selftests/kvm/include/{s390x => s390}/ucall.h (100%)
+ rename tools/testing/selftests/kvm/include/{x86_64 => x86}/apic.h (98%)
+ rename tools/testing/selftests/kvm/include/{x86_64 => x86}/evmcs.h (99%)
+ rename tools/testing/selftests/kvm/include/{x86_64 => x86}/hyperv.h (99%)
+ rename tools/testing/selftests/kvm/include/{x86_64 => x86}/kvm_util_arch.h (100%)
+ rename tools/testing/selftests/kvm/include/{x86_64 => x86}/mce.h (94%)
+ rename tools/testing/selftests/kvm/include/{x86_64 => x86}/pmu.h (100%)
+ rename tools/testing/selftests/kvm/include/{x86_64 => x86}/processor.h (99%)
+ rename tools/testing/selftests/kvm/include/{x86_64 => x86}/sev.h (100%)
+ rename tools/testing/selftests/kvm/include/{x86_64 => x86}/svm.h (98%)
+ rename tools/testing/selftests/kvm/include/{x86_64 => x86}/svm_util.h (94%)
+ rename tools/testing/selftests/kvm/include/{x86_64 => x86}/ucall.h (100%)
+ rename tools/testing/selftests/kvm/include/{x86_64 => x86}/vmx.h (99%)
+ rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic.c (100%)
+ rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic_private.h (100%)
+ rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic_v3.c (100%)
+ rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic_v3_its.c (100%)
+ rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/handlers.S (100%)
+ rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/processor.c (98%)
+ rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/spinlock.c (100%)
+ rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/ucall.c (100%)
+ rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/vgic.c (100%)
+ rename tools/testing/selftests/kvm/lib/{s390x => s390}/diag318_test_handler.c (100%)
+ rename tools/testing/selftests/kvm/lib/{s390x => s390}/facility.c (100%)
+ rename tools/testing/selftests/kvm/lib/{s390x => s390}/processor.c (100%)
+ rename tools/testing/selftests/kvm/lib/{s390x => s390}/ucall.c (100%)
+ rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/apic.c (100%)
+ rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/handlers.S (100%)
+ rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/hyperv.c (100%)
+ rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/memstress.c (98%)
+ rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/pmu.c (100%)
+ rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/processor.c (99%)
+ rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/sev.c (100%)
+ rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/svm.c (99%)
+ rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/ucall.c (100%)
+ rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/vmx.c (99%)
+ rename tools/testing/selftests/kvm/{max_guest_memory_test.c => mmu_stress_test.c} (60%)
+ rename tools/testing/selftests/kvm/{s390x => s390}/cmma_test.c (100%)
+ rename tools/testing/selftests/kvm/{s390x => s390}/config (100%)
+ rename tools/testing/selftests/kvm/{s390x => s390}/cpumodel_subfuncs_test.c (100%)
+ rename tools/testing/selftests/kvm/{s390x => s390}/debug_test.c (100%)
+ rename tools/testing/selftests/kvm/{s390x => s390}/memop.c (100%)
+ rename tools/testing/selftests/kvm/{s390x => s390}/resets.c (99%)
+ rename tools/testing/selftests/kvm/{s390x => s390}/shared_zeropage_test.c (100%)
+ rename tools/testing/selftests/kvm/{s390x => s390}/sync_regs_test.c (100%)
+ rename tools/testing/selftests/kvm/{s390x => s390}/tprot.c (100%)
+ rename tools/testing/selftests/kvm/{s390x => s390}/ucontrol_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/amx_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/apic_bus_clock_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/cpuid_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/cr4_cpuid_sync_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/debug_regs.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/dirty_log_page_splitting_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/exit_on_emulation_failure_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/feature_msrs_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/fix_hypercall_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/flds_emulation.h (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/hwcr_msr_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_clock.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_cpuid.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_evmcs.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_extended_hypercalls.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_features.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_ipi.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_svm_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_tlb_flush.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/kvm_clock_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/kvm_pv_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/max_vcpuid_cap_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/monitor_mwait_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/nested_exceptions_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/nx_huge_pages_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/nx_huge_pages_test.sh (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/platform_info_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/pmu_counters_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/pmu_event_filter_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/private_mem_conversions_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/private_mem_kvm_exits_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/recalc_apic_map_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/set_boot_cpu_id.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/set_sregs_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/sev_init2_tests.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/sev_migrate_tests.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/sev_smoke_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/smaller_maxphyaddr_emulation_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/smm_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/state_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_int_ctl_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_nested_shutdown_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_nested_soft_inject_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_vmcall_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/sync_regs_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/triple_fault_event_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/tsc_msrs_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/tsc_scaling_sync.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/ucna_injection_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/userspace_io_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/userspace_msr_exit_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_apic_access_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_close_while_nested_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_dirty_log_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_exception_with_invalid_guest_state.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_invalid_nested_guest_state.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_msrs_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_nested_tsc_scaling_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_pmu_caps_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_preemption_timer_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_set_nested_state_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_tsc_adjust_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/xapic_ipi_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/xapic_state_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/xcr0_cpuid_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/xen_shinfo_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/xen_vmcall_test.c (100%)
+ rename tools/testing/selftests/kvm/{x86_64 => x86}/xss_msr_test.c (100%)
+Merging kvm-arm/next (00163be8bb59 Merge branch kvm-arm64/nv-timers into kvmarm-master/next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next
+Auto-merging arch/arm64/include/asm/kvm_arm.h
+Auto-merging arch/arm64/include/asm/kvm_emulate.h
+CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_emulate.h
+Auto-merging arch/arm64/include/asm/kvm_nested.h
+Auto-merging arch/arm64/kvm/arm.c
+Auto-merging arch/arm64/kvm/emulate-nested.c
+Auto-merging arch/arm64/kvm/fpsimd.c
+CONFLICT (content): Merge conflict in arch/arm64/kvm/fpsimd.c
+Auto-merging arch/arm64/kvm/hyp/include/hyp/switch.h
+Auto-merging arch/arm64/kvm/hyp/nvhe/hyp-main.c
+Auto-merging arch/arm64/kvm/hyp/nvhe/pkvm.c
+CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp/nvhe/pkvm.c
+Auto-merging arch/arm64/kvm/hyp/nvhe/switch.c
+CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp/nvhe/switch.c
+Auto-merging arch/arm64/kvm/hyp/pgtable.c
+Auto-merging arch/arm64/kvm/hyp/vhe/switch.c
+Recorded preimage for 'arch/arm64/include/asm/kvm_emulate.h'
+Recorded preimage for 'arch/arm64/kvm/fpsimd.c'
+Recorded preimage for 'arch/arm64/kvm/hyp/nvhe/pkvm.c'
+Recorded preimage for 'arch/arm64/kvm/hyp/nvhe/switch.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'arch/arm64/include/asm/kvm_emulate.h'.
+Recorded resolution for 'arch/arm64/kvm/fpsimd.c'.
+Recorded resolution for 'arch/arm64/kvm/hyp/nvhe/pkvm.c'.
+Recorded resolution for 'arch/arm64/kvm/hyp/nvhe/switch.c'.
+[master 6e6a3b6078e0] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virt/kvm/devices/vcpu.rst | 15 +-
+ arch/arm64/include/asm/cputype.h | 2 +
+ arch/arm64/include/asm/kvm_arm.h | 2 +-
+ arch/arm64/include/asm/kvm_asm.h | 14 +-
+ arch/arm64/include/asm/kvm_emulate.h | 29 +-
+ arch/arm64/include/asm/kvm_host.h | 123 ++++---
+ arch/arm64/include/asm/kvm_mmu.h | 16 +
+ arch/arm64/include/asm/kvm_nested.h | 1 +
+ arch/arm64/include/asm/kvm_pgtable.h | 36 +-
+ arch/arm64/include/asm/kvm_pkvm.h | 51 +++
+ arch/arm64/include/asm/sysreg.h | 4 +
+ arch/arm64/kernel/cpu_errata.c | 8 +
+ arch/arm64/kernel/image-vars.h | 3 +
+ arch/arm64/kvm/arch_timer.c | 179 ++++++++--
+ arch/arm64/kvm/arm.c | 68 ++--
+ arch/arm64/kvm/debug.c | 428 +++++++++--------------
+ arch/arm64/kvm/emulate-nested.c | 81 ++++-
+ arch/arm64/kvm/fpsimd.c | 12 +-
+ arch/arm64/kvm/guest.c | 31 +-
+ arch/arm64/kvm/handle_exit.c | 5 +-
+ arch/arm64/kvm/hyp/include/hyp/debug-sr.h | 42 +--
+ arch/arm64/kvm/hyp/include/hyp/switch.h | 39 ++-
+ arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 43 ++-
+ arch/arm64/kvm/hyp/include/nvhe/fixed_config.h | 223 ------------
+ arch/arm64/kvm/hyp/include/nvhe/gfp.h | 6 +-
+ arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 39 +--
+ arch/arm64/kvm/hyp/include/nvhe/memory.h | 50 ++-
+ arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 23 ++
+ arch/arm64/kvm/hyp/nvhe/debug-sr.c | 13 +-
+ arch/arm64/kvm/hyp/nvhe/hyp-main.c | 209 ++++++++++--
+ arch/arm64/kvm/hyp/nvhe/mem_protect.c | 320 ++++++++++++++++--
+ arch/arm64/kvm/hyp/nvhe/page_alloc.c | 14 +-
+ arch/arm64/kvm/hyp/nvhe/pkvm.c | 430 +++++++++++------------
+ arch/arm64/kvm/hyp/nvhe/setup.c | 8 +-
+ arch/arm64/kvm/hyp/nvhe/switch.c | 52 +--
+ arch/arm64/kvm/hyp/nvhe/sys_regs.c | 450 ++++++++++++++-----------
+ arch/arm64/kvm/hyp/nvhe/timer-sr.c | 16 +-
+ arch/arm64/kvm/hyp/pgtable.c | 13 +-
+ arch/arm64/kvm/hyp/vhe/debug-sr.c | 5 -
+ arch/arm64/kvm/hyp/vhe/switch.c | 107 ++++++
+ arch/arm64/kvm/mmu.c | 93 +++--
+ arch/arm64/kvm/nested.c | 29 +-
+ arch/arm64/kvm/pkvm.c | 201 +++++++++++
+ arch/arm64/kvm/reset.c | 6 +-
+ arch/arm64/kvm/sys_regs.c | 409 ++++++++++++----------
+ arch/arm64/kvm/trace_handle_exit.h | 75 -----
+ arch/arm64/kvm/vgic/vgic-v3.c | 6 +-
+ arch/arm64/tools/cpucaps | 1 +
+ include/clocksource/arm_arch_timer.h | 6 +
+ include/kvm/arm_arch_timer.h | 23 ++
+ 50 files changed, 2447 insertions(+), 1612 deletions(-)
+ delete mode 100644 arch/arm64/kvm/hyp/include/nvhe/fixed_config.h
+Merging kvms390/next (7a1f3143377a KVM: s390: selftests: Add regression tests for PFCR subfunctions)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next
+Already up to date.
+Merging kvm-ppc/topic/ppc-kvm (fac04efc5c79 Linux 6.13-rc2)
+$ git merge -m Merge branch 'topic/ppc-kvm' of git://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 (af79caa83f6a RISC-V: KVM: Add new exit statstics for redirected traps)
+$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next
+Auto-merging arch/riscv/include/uapi/asm/kvm.h
+Merge made by the 'ort' strategy.
+ arch/riscv/include/asm/kvm_host.h | 5 ++
+ arch/riscv/include/asm/kvm_vcpu_sbi.h | 1 +
+ arch/riscv/include/uapi/asm/kvm.h | 4 ++
+ arch/riscv/kvm/Makefile | 1 +
+ arch/riscv/kvm/vcpu.c | 7 ++-
+ arch/riscv/kvm/vcpu_exit.c | 37 ++++++++++--
+ arch/riscv/kvm/vcpu_onereg.c | 6 ++
+ arch/riscv/kvm/vcpu_sbi.c | 4 ++
+ arch/riscv/kvm/vcpu_sbi_system.c | 73 ++++++++++++++++++++++++
+ tools/testing/selftests/kvm/riscv/get-reg-list.c | 18 +++++-
+ 10 files changed, 150 insertions(+), 6 deletions(-)
+ create mode 100644 arch/riscv/kvm/vcpu_sbi_system.c
+Merging kvm-x86/next (13e98294d7ce Merge branches 'fixes', 'misc', 'mmu', 'svm', 'vcpu_array' and 'vmx')
+$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next
+Auto-merging Documentation/virt/kvm/api.rst
+Auto-merging arch/x86/kvm/cpuid.c
+CONFLICT (content): Merge conflict in arch/x86/kvm/cpuid.c
+Auto-merging arch/x86/kvm/svm/sev.c
+Auto-merging arch/x86/kvm/x86.c
+Recorded preimage for 'arch/x86/kvm/cpuid.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'arch/x86/kvm/cpuid.c'.
+[master 13fd168e8aac] Merge branch 'next' of https://github.com/kvm-x86/linux.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virt/kvm/api.rst | 10 +-
+ arch/x86/include/asm/kvm-x86-ops.h | 2 +-
+ arch/x86/include/asm/kvm_host.h | 68 +-
+ arch/x86/kvm/cpuid.c | 998 ++++++++++++++-------
+ arch/x86/kvm/cpuid.h | 132 ++-
+ arch/x86/kvm/governed_features.h | 22 -
+ arch/x86/kvm/hyperv.c | 2 +-
+ arch/x86/kvm/kvm_emulate.h | 2 +
+ arch/x86/kvm/lapic.c | 29 +-
+ arch/x86/kvm/lapic.h | 1 +
+ arch/x86/kvm/mmu.h | 2 +-
+ arch/x86/kvm/mmu/mmu.c | 4 +-
+ arch/x86/kvm/mmu/mmu_internal.h | 4 +
+ arch/x86/kvm/pmu.c | 1 -
+ arch/x86/kvm/reverse_cpuid.h | 23 +-
+ arch/x86/kvm/smm.c | 10 +-
+ arch/x86/kvm/svm/nested.c | 22 +-
+ arch/x86/kvm/svm/pmu.c | 8 +-
+ arch/x86/kvm/svm/sev.c | 21 +-
+ arch/x86/kvm/svm/svm.c | 75 +-
+ arch/x86/kvm/svm/svm.h | 23 +-
+ arch/x86/kvm/trace.h | 17 +-
+ arch/x86/kvm/vmx/hyperv.h | 2 +-
+ arch/x86/kvm/vmx/main.c | 2 +-
+ arch/x86/kvm/vmx/nested.c | 100 ++-
+ arch/x86/kvm/vmx/pmu_intel.c | 4 +-
+ arch/x86/kvm/vmx/sgx.c | 14 +-
+ arch/x86/kvm/vmx/vmx.c | 140 ++-
+ arch/x86/kvm/vmx/vmx.h | 1 +
+ arch/x86/kvm/vmx/x86_ops.h | 6 +-
+ arch/x86/kvm/x86.c | 184 ++--
+ arch/x86/kvm/x86.h | 6 +-
+ include/linux/kvm_host.h | 16 +-
+ include/uapi/linux/kvm.h | 4 -
+ .../testing/selftests/kvm/include/x86/processor.h | 25 +-
+ .../testing/selftests/kvm/set_memory_region_test.c | 53 +-
+ tools/testing/selftests/kvm/x86/kvm_pv_test.c | 38 +-
+ tools/testing/selftests/kvm/x86/set_sregs_test.c | 63 +-
+ tools/testing/selftests/kvm/x86/sev_smoke_test.c | 2 +-
+ virt/kvm/kvm_main.c | 68 +-
+ 40 files changed, 1369 insertions(+), 835 deletions(-)
+ delete mode 100644 arch/x86/kvm/governed_features.h
+Merging xen-tip/linux-next (fac04efc5c79 Linux 6.13-rc2)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next
+Already up to date.
+Merging percpu/for-next (87d6aab2389e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next
+Already up to date.
+Merging workqueues/for-next (d57212f281fd workqueue: add printf attribute to __alloc_workqueue())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next
+Already up to date.
+Merging sched-ext/for-next (37e6cc1c0c68 Merge branch 'for-6.14' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next
+Merge made by the 'ort' strategy.
+ kernel/sched/ext.c | 160 ++++++++++++++++--------
+ tools/sched_ext/include/scx/common.bpf.h | 83 +++++++++++-
+ tools/sched_ext/include/scx/common.h | 6 +
+ tools/sched_ext/include/scx/compat.h | 1 +
+ tools/sched_ext/include/scx/enums.autogen.bpf.h | 105 ++++++++++++++++
+ tools/sched_ext/include/scx/enums.autogen.h | 41 ++++++
+ tools/sched_ext/include/scx/enums.bpf.h | 12 ++
+ tools/sched_ext/include/scx/enums.h | 27 ++++
+ tools/sched_ext/include/scx/user_exit_info.h | 9 +-
+ tools/sched_ext/scx_central.bpf.c | 2 +-
+ tools/sched_ext/scx_central.c | 1 +
+ tools/sched_ext/scx_flatcg.bpf.c | 2 +-
+ tools/sched_ext/scx_flatcg.c | 1 +
+ tools/sched_ext/scx_qmap.bpf.c | 2 +-
+ tools/sched_ext/scx_qmap.c | 2 +
+ 15 files changed, 396 insertions(+), 58 deletions(-)
+ create mode 100644 tools/sched_ext/include/scx/enums.autogen.bpf.h
+ create mode 100644 tools/sched_ext/include/scx/enums.autogen.h
+ create mode 100644 tools/sched_ext/include/scx/enums.bpf.h
+ create mode 100644 tools/sched_ext/include/scx/enums.h
+Merging drivers-x86/for-next (6b228cfc52a6 alienware-wmi: Use devm_platform_profile_register())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/platform/x86/asus-wmi.c
+Auto-merging drivers/platform/x86/dell/alienware-wmi.c
+Auto-merging drivers/platform/x86/hp/hp-wmi.c
+Auto-merging drivers/platform/x86/thinkpad_acpi.c
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-platform_profile | 5 +
+ .../userspace-api/sysfs-platform_profile.rst | 38 ++
+ MAINTAINERS | 2 +-
+ arch/x86/include/uapi/asm/amd_hsmp.h | 64 ++-
+ drivers/acpi/platform_profile.c | 573 +++++++++++++++++----
+ drivers/i2c/busses/i2c-i801.c | 124 -----
+ drivers/platform/mellanox/mlxbf-bootctl.c | 6 +-
+ drivers/platform/mellanox/mlxbf-pmc.c | 6 +-
+ .../platform/surface/surface_platform_profile.c | 8 +-
+ drivers/platform/x86/acer-wmi.c | 176 +++++--
+ drivers/platform/x86/amd/hsmp/acpi.c | 12 +-
+ drivers/platform/x86/amd/hsmp/hsmp.c | 47 +-
+ drivers/platform/x86/amd/hsmp/plat.c | 12 +-
+ drivers/platform/x86/amd/pmc/Makefile | 2 +-
+ drivers/platform/x86/amd/pmc/mp1_stb.c | 332 ++++++++++++
+ drivers/platform/x86/amd/pmc/pmc.c | 391 +++-----------
+ drivers/platform/x86/amd/pmc/pmc.h | 24 +-
+ drivers/platform/x86/amd/pmf/Makefile | 2 +-
+ drivers/platform/x86/amd/pmf/acpi.c | 30 +-
+ drivers/platform/x86/amd/pmf/core.c | 19 +-
+ drivers/platform/x86/amd/pmf/pmf-quirks.c | 66 ---
+ drivers/platform/x86/amd/pmf/pmf.h | 18 +-
+ drivers/platform/x86/amd/pmf/spc.c | 24 +
+ drivers/platform/x86/amd/pmf/sps.c | 4 +-
+ drivers/platform/x86/asus-wmi.c | 8 +-
+ drivers/platform/x86/dell/Kconfig | 1 +
+ drivers/platform/x86/dell/Makefile | 1 +
+ drivers/platform/x86/dell/alienware-wmi.c | 16 +-
+ drivers/platform/x86/dell/dcdbas.c | 10 +-
+ drivers/platform/x86/dell/dcdbas.h | 8 -
+ drivers/platform/x86/dell/dell-lis3lv02d.c | 207 ++++++++
+ drivers/platform/x86/dell/dell-pc.c | 38 +-
+ drivers/platform/x86/dell/dell-smo8800-ids.h | 27 +
+ drivers/platform/x86/dell/dell-smo8800.c | 16 +-
+ drivers/platform/x86/dell/dell-uart-backlight.c | 2 +-
+ drivers/platform/x86/dell/dell_rbu.c | 20 +-
+ drivers/platform/x86/fujitsu-laptop.c | 8 +-
+ drivers/platform/x86/hp/hp-wmi.c | 8 +-
+ drivers/platform/x86/ideapad-laptop.c | 6 +-
+ drivers/platform/x86/inspur_platform_profile.c | 7 +-
+ drivers/platform/x86/intel/Kconfig | 1 +
+ drivers/platform/x86/intel/bytcrc_pwrsrc.c | 79 ++-
+ drivers/platform/x86/intel/int0002_vgpio.c | 14 +-
+ drivers/platform/x86/intel/int3472/common.c | 2 +
+ drivers/platform/x86/intel/int3472/discrete.c | 24 +-
+ drivers/platform/x86/intel/int3472/tps68470.c | 3 +
+ drivers/platform/x86/intel/plr_tpmi.c | 2 +-
+ drivers/platform/x86/intel/pmt/class.c | 4 +-
+ drivers/platform/x86/intel/sdsi.c | 34 +-
+ drivers/platform/x86/quickstart.c | 1 -
+ drivers/platform/x86/serdev_helpers.h | 60 ++-
+ drivers/platform/x86/thinkpad_acpi.c | 16 +-
+ drivers/platform/x86/wmi-bmof.c | 77 +--
+ drivers/platform/x86/x86-android-tablets/Makefile | 2 +-
+ drivers/platform/x86/x86-android-tablets/asus.c | 4 +-
+ drivers/platform/x86/x86-android-tablets/core.c | 31 +-
+ drivers/platform/x86/x86-android-tablets/lenovo.c | 8 +-
+ drivers/platform/x86/x86-android-tablets/other.c | 16 +-
+ .../x86/x86-android-tablets/vexia_atla10_ec.c | 261 ++++++++++
+ .../x86/x86-android-tablets/x86-android-tablets.h | 13 +-
+ include/linux/platform_profile.h | 10 +-
+ 61 files changed, 2113 insertions(+), 917 deletions(-)
+ create mode 100644 drivers/platform/x86/amd/pmc/mp1_stb.c
+ delete mode 100644 drivers/platform/x86/amd/pmf/pmf-quirks.c
+ create mode 100644 drivers/platform/x86/dell/dell-lis3lv02d.c
+ create mode 100644 drivers/platform/x86/dell/dell-smo8800-ids.h
+ create mode 100644 drivers/platform/x86/x86-android-tablets/vexia_atla10_ec.c
+Merging chrome-platform/for-next (df78050d1a13 platform/chrome: Update ChromeOS EC command tracing)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next
+Merge made by the 'ort' strategy.
+ .../chrome/google,cros-kbd-led-backlight.yaml | 36 ----------
+ .../devicetree/bindings/mfd/google,cros-ec.yaml | 3 -
+ drivers/platform/chrome/cros_ec.c | 5 ++
+ drivers/platform/chrome/cros_ec_i2c.c | 3 +-
+ drivers/platform/chrome/cros_ec_ishtp.c | 2 +-
+ drivers/platform/chrome/cros_ec_lpc.c | 4 +-
+ drivers/platform/chrome/cros_ec_proto.c | 69 ++++++++++++++++---
+ drivers/platform/chrome/cros_ec_rpmsg.c | 2 +-
+ drivers/platform/chrome/cros_ec_spi.c | 2 +-
+ drivers/platform/chrome/cros_ec_trace.c | 10 +++
+ drivers/platform/chrome/cros_ec_uart.c | 2 +-
+ drivers/platform/chrome/cros_ec_vbc.c | 10 +--
+ drivers/platform/chrome/cros_kbd_led_backlight.c | 79 +++++-----------------
+ include/linux/platform_data/cros_ec_proto.h | 7 ++
+ 14 files changed, 113 insertions(+), 121 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/chrome/google,cros-kbd-led-backlight.yaml
+Merging chrome-platform-firmware/for-firmware-next (7543d5702c2c firmware: google: vpd: Use const 'struct bin_attribute' callback)
+$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next
+Merge made by the 'ort' strategy.
+ drivers/firmware/google/cbmem.c | 10 +++++-----
+ drivers/firmware/google/gsmi.c | 6 +++---
+ drivers/firmware/google/memconsole.c | 4 ++--
+ drivers/firmware/google/vpd.c | 8 ++++----
+ 4 files changed, 14 insertions(+), 14 deletions(-)
+Merging hsi/for-next (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next
+Already up to date.
+Merging leds-lj/for-leds-next (29df7025cff0 leds: pwm-multicolor: Disable PWM when going to suspend)
+$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/leds/Kconfig
+Auto-merging drivers/leds/Makefile
+Merge made by the 'ort' strategy.
+ .../bindings/leds/cznic,turris-omnia-leds.yaml | 8 +
+ .../bindings/leds/leds-class-multicolor.yaml | 2 +-
+ .../bindings/leds/qcom,spmi-flash-led.yaml | 1 +
+ MAINTAINERS | 8 +
+ drivers/leds/Kconfig | 11 +
+ drivers/leds/Makefile | 1 +
+ drivers/leds/leds-lp8860.c | 2 +-
+ drivers/leds/leds-netxbig.c | 1 +
+ drivers/leds/leds-turris-omnia.c | 334 ++++++++++-----------
+ drivers/leds/leds-upboard.c | 126 ++++++++
+ drivers/leds/rgb/leds-pwm-multicolor.c | 8 +-
+ drivers/leds/trigger/ledtrig-activity.c | 2 +-
+ drivers/leds/trigger/ledtrig-netdev.c | 2 +
+ drivers/platform/cznic/turris-omnia-mcu-base.c | 3 +
+ drivers/platform/cznic/turris-omnia-mcu.h | 130 --------
+ include/linux/turris-omnia-mcu-interface.h | 150 ++++++++-
+ 16 files changed, 487 insertions(+), 302 deletions(-)
+ create mode 100644 drivers/leds/leds-upboard.c
+Merging ipmi/for-next (fb26183667d3 ipmi: ssif_bmc: Move smbus_cmd assignment after cleanup)
+$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next
+Auto-merging drivers/char/ipmi/ipmi_watchdog.c
+Merge made by the 'ort' strategy.
+ drivers/char/ipmi/ipmb_dev_int.c | 5 +++++
+ drivers/char/ipmi/ipmi_devintf.c | 5 +----
+ drivers/char/ipmi/ipmi_msghandler.c | 4 +---
+ drivers/char/ipmi/ipmi_poweroff.c | 6 +-----
+ drivers/char/ipmi/ipmi_si_pci.c | 2 +-
+ drivers/char/ipmi/ipmi_watchdog.c | 5 +----
+ drivers/char/ipmi/ssif_bmc.c | 6 +++++-
+ include/linux/ipmi.h | 2 +-
+ 8 files changed, 16 insertions(+), 19 deletions(-)
+Merging driver-core/driver-core-next (7687c66c18c6 kunit: platform: Resolve 'struct completion' warning)
+$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/block/sunvdc.c
+Auto-merging drivers/cxl/core/region.c
+Auto-merging drivers/gpio/gpio-sim.c
+Auto-merging drivers/gpu/drm/mediatek/mtk_drm_drv.c
+Auto-merging drivers/hwmon/hwmon.c
+Auto-merging drivers/media/pci/mgb4/mgb4_core.c
+Auto-merging drivers/thunderbolt/retimer.c
+Auto-merging include/linux/device/bus.h
+Auto-merging rust/kernel/sync.rs
+Merge made by the 'ort' strategy.
+ Documentation/userspace-api/ioctl/ioctl-number.rst | 1 +
+ MAINTAINERS | 11 +
+ arch/sparc/kernel/vio.c | 6 +-
+ drivers/base/core.c | 38 +-
+ drivers/base/test/Kconfig | 1 +
+ drivers/base/test/platform-device-test.c | 41 +-
+ drivers/block/sunvdc.c | 6 +-
+ drivers/bus/fsl-mc/dprc-driver.c | 8 +-
+ drivers/cxl/core/pci.c | 4 +-
+ drivers/cxl/core/pmem.c | 15 +-
+ drivers/cxl/core/region.c | 21 +-
+ drivers/cxl/cxl.h | 1 -
+ drivers/firewire/core-device.c | 4 +-
+ drivers/firmware/arm_scmi/bus.c | 4 +-
+ drivers/firmware/efi/dev-path-parser.c | 4 +-
+ drivers/gpio/gpio-sim.c | 7 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +-
+ drivers/hwmon/hwmon.c | 2 +-
+ drivers/media/pci/mgb4/mgb4_core.c | 4 +-
+ drivers/nvdimm/bus.c | 2 +-
+ drivers/nvdimm/claim.c | 9 +-
+ drivers/of/unittest-data/tests-platform.dtsi | 5 +
+ drivers/pwm/core.c | 2 +-
+ drivers/rpmsg/rpmsg_core.c | 4 +-
+ drivers/scsi/qla4xxx/ql4_os.c | 3 +-
+ drivers/scsi/scsi_transport_iscsi.c | 10 +-
+ drivers/slimbus/core.c | 17 +-
+ drivers/thunderbolt/retimer.c | 2 +-
+ drivers/thunderbolt/xdomain.c | 2 +-
+ drivers/tty/serial/serial_core.c | 4 +-
+ drivers/usb/typec/class.c | 31 +-
+ include/kunit/platform_device.h | 1 +
+ include/linux/device.h | 4 +-
+ include/linux/device/bus.h | 1 +
+ include/scsi/scsi_transport_iscsi.h | 4 +-
+ kernel/kheaders.c | 19 +-
+ net/dsa/dsa.c | 2 +-
+ rust/bindings/bindings_helper.h | 3 +
+ rust/helpers/device.c | 10 +
+ rust/helpers/helpers.c | 5 +
+ rust/helpers/io.c | 101 +++++
+ rust/helpers/pci.c | 18 +
+ rust/helpers/platform.c | 13 +
+ rust/helpers/rcu.c | 13 +
+ rust/kernel/device_id.rs | 165 ++++++++
+ rust/kernel/devres.rs | 178 +++++++++
+ rust/kernel/driver.rs | 173 +++++++++
+ rust/kernel/io.rs | 260 +++++++++++++
+ rust/kernel/lib.rs | 20 +
+ rust/kernel/miscdevice.rs | 100 ++++-
+ rust/kernel/of.rs | 60 +++
+ rust/kernel/pci.rs | 432 +++++++++++++++++++++
+ rust/kernel/platform.rs | 198 ++++++++++
+ rust/kernel/revocable.rs | 219 +++++++++++
+ rust/kernel/sync.rs | 1 +
+ rust/kernel/sync/rcu.rs | 47 +++
+ rust/kernel/types.rs | 11 +
+ rust/macros/module.rs | 4 +
+ samples/rust/Kconfig | 31 ++
+ samples/rust/Makefile | 3 +
+ samples/rust/rust_driver_pci.rs | 110 ++++++
+ samples/rust/rust_driver_platform.rs | 49 +++
+ samples/rust/rust_misc_device.rs | 238 ++++++++++++
+ tools/testing/cxl/test/cxl.c | 2 +-
+ 64 files changed, 2607 insertions(+), 159 deletions(-)
+ create mode 100644 rust/helpers/device.c
+ create mode 100644 rust/helpers/io.c
+ create mode 100644 rust/helpers/pci.c
+ create mode 100644 rust/helpers/platform.c
+ create mode 100644 rust/helpers/rcu.c
+ create mode 100644 rust/kernel/device_id.rs
+ create mode 100644 rust/kernel/devres.rs
+ create mode 100644 rust/kernel/driver.rs
+ create mode 100644 rust/kernel/io.rs
+ create mode 100644 rust/kernel/of.rs
+ create mode 100644 rust/kernel/pci.rs
+ create mode 100644 rust/kernel/platform.rs
+ create mode 100644 rust/kernel/revocable.rs
+ create mode 100644 rust/kernel/sync/rcu.rs
+ create mode 100644 samples/rust/rust_driver_pci.rs
+ create mode 100644 samples/rust/rust_driver_platform.rs
+ create mode 100644 samples/rust/rust_misc_device.rs
+$ git am -3 ../patches/0001-fix-up-for-driver-core-Constify-API-device_find_chil.patch
+Applying: fix up for "driver core: Constify API device_find_child() and adapt for various usages"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/i2c/i2c-core-base.c
+$ git add -A .
+$ git commit -v -a --amend
+[master b9e31b20f872] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
+ Date: Mon Jan 6 15:10:00 2025 +1100
+$ git am -3 ../patches/0001-fix-up-2-for-driver-core-Constify-API-device_find_ch.patch
+Applying: fix up 2 for "driver core: Constify API device_find_child() and adapt for various usages"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/leds/leds-turris-omnia.c
+$ git add -A .
+$ git commit -v -a --amend
+[master bf5610c17193] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
+ Date: Mon Jan 6 15:10:00 2025 +1100
+Merging usb/usb-next (f1a2241778d9 usb: typec: ucsi: Implement ChromeOS UCSI driver)
+$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next
+Auto-merging MAINTAINERS
+Auto-merging arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
+Auto-merging drivers/usb/class/usblp.c
+Auto-merging drivers/usb/dwc3/core.h
+Auto-merging drivers/usb/dwc3/dwc3-am62.c
+Auto-merging drivers/usb/dwc3/gadget.c
+Auto-merging drivers/usb/typec/class.c
+Auto-merging drivers/usb/typec/tcpm/tcpci.c
+Auto-merging scripts/mod/file2alias.c
+Resolved 'arch/arm64/boot/dts/qcom/x1e80100-qcp.dts' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 19b7fbd761e7] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/connector/usb-connector.yaml | 7 +
+ .../devicetree/bindings/usb/gpio-sbu-mux.yaml | 1 +
+ .../devicetree/bindings/usb/maxim,max33359.yaml | 9 +-
+ .../devicetree/bindings/usb/qcom,dwc3.yaml | 5 +
+ .../devicetree/bindings/usb/renesas,usbhs.yaml | 2 +
+ Documentation/usb/usbip_protocol.rst | 12 +-
+ MAINTAINERS | 10 +
+ arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 178 +++++
+ drivers/platform/chrome/Kconfig | 7 +
+ drivers/platform/chrome/Makefile | 4 +
+ drivers/platform/chrome/cros_ec_typec.c | 46 +-
+ drivers/platform/chrome/cros_ec_typec.h | 1 +
+ drivers/platform/chrome/cros_typec_altmode.c | 373 +++++++++++
+ drivers/platform/chrome/cros_typec_altmode.h | 51 ++
+ drivers/usb/cdns3/core.c | 4 +-
+ drivers/usb/chipidea/host.c | 10 +-
+ drivers/usb/class/usblp.c | 2 +-
+ drivers/usb/common/common.c | 14 +
+ drivers/usb/core/driver.c | 7 +-
+ drivers/usb/core/hcd-pci.c | 15 +-
+ drivers/usb/core/sysfs.c | 12 +-
+ drivers/usb/dwc3/core.c | 20 +
+ drivers/usb/dwc3/core.h | 2 +-
+ drivers/usb/dwc3/dwc3-am62.c | 82 ++-
+ drivers/usb/dwc3/dwc3-omap.c | 12 +-
+ drivers/usb/dwc3/gadget.c | 2 +
+ drivers/usb/gadget/function/f_tcm.c | 723 +++++++++++++++------
+ drivers/usb/gadget/function/storage_common.h | 2 +-
+ drivers/usb/gadget/function/tcm.h | 28 +-
+ drivers/usb/host/xhci-caps.h | 6 +
+ drivers/usb/host/xhci-dbgcap.c | 2 +-
+ drivers/usb/host/xhci-dbgtty.c | 98 ++-
+ drivers/usb/host/xhci-ring.c | 13 +-
+ drivers/usb/host/xhci.h | 4 +
+ drivers/usb/storage/Kconfig | 3 +-
+ drivers/usb/storage/transport.c | 8 +-
+ drivers/usb/typec/altmodes/Kconfig | 9 +
+ drivers/usb/typec/altmodes/Makefile | 2 +
+ drivers/usb/typec/altmodes/displayport.c | 4 +-
+ drivers/usb/typec/altmodes/nvidia.c | 2 +-
+ drivers/usb/typec/altmodes/thunderbolt.c | 388 +++++++++++
+ drivers/usb/typec/bus.c | 6 +-
+ drivers/usb/typec/class.c | 9 +-
+ drivers/usb/typec/hd3ss3220.c | 207 +++++-
+ drivers/usb/typec/mux/intel_pmc_mux.c | 2 +-
+ drivers/usb/typec/tcpm/tcpci.c | 4 +-
+ drivers/usb/typec/tcpm/tcpci_mt6370.c | 1 -
+ drivers/usb/typec/tcpm/tcpm.c | 87 ++-
+ drivers/usb/typec/ucsi/Kconfig | 13 +
+ drivers/usb/typec/ucsi/Makefile | 1 +
+ drivers/usb/typec/ucsi/cros_ec_ucsi.c | 337 ++++++++++
+ drivers/usb/typec/ucsi/ucsi_yoga_c630.c | 2 +-
+ drivers/usb/usbip/vhci_hcd.c | 8 +-
+ drivers/usb/usbip/vudc_sysfs.c | 8 +-
+ include/linux/platform_data/cros_ec_commands.h | 28 +-
+ include/linux/pm.h | 3 +-
+ include/linux/usb/pd.h | 22 +-
+ include/linux/usb/storage.h | 8 +
+ include/linux/usb/typec.h | 2 +
+ include/linux/usb/typec_tbt.h | 1 +
+ include/uapi/linux/usb/functionfs.h | 8 +-
+ scripts/mod/devicetable-offsets.c | 1 -
+ scripts/mod/file2alias.c | 9 +-
+ 63 files changed, 2555 insertions(+), 392 deletions(-)
+ create mode 100644 drivers/platform/chrome/cros_typec_altmode.c
+ create mode 100644 drivers/platform/chrome/cros_typec_altmode.h
+ create mode 100644 drivers/usb/typec/altmodes/thunderbolt.c
+ create mode 100644 drivers/usb/typec/ucsi/cros_ec_ucsi.c
+Merging thunderbolt/next (43d84701d2aa thunderbolt: Expose router DROM through debugfs)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next
+Merge made by the 'ort' strategy.
+ drivers/thunderbolt/ctl.c | 11 +-
+ drivers/thunderbolt/ctl.h | 1 -
+ drivers/thunderbolt/debugfs.c | 69 +++++--
+ drivers/thunderbolt/eeprom.c | 78 ++++----
+ drivers/thunderbolt/path.c | 4 +-
+ drivers/thunderbolt/tb.c | 196 ++++++++++++++------
+ drivers/thunderbolt/tb.h | 5 +
+ drivers/thunderbolt/test.c | 90 +++++-----
+ drivers/thunderbolt/tunnel.c | 406 ++++++++++++++++++++++++++----------------
+ drivers/thunderbolt/tunnel.h | 61 ++++++-
+ 10 files changed, 601 insertions(+), 320 deletions(-)
+Merging usb-serial/usb-next (4bbf9020becb Linux 6.13-rc4)
+$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next
+Already up to date.
+Merging tty/tty-next (2c1fd53af21b serial: amba-pl011: Fix RTS handling in RS485 mode)
+$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
+Auto-merging drivers/tty/serial/8250/8250_core.c
+Auto-merging drivers/tty/serial/serial_core.c
+Auto-merging drivers/tty/tty_io.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/serial/renesas,scif.yaml | 5 +
+ drivers/parport/parport_serial.c | 12 +-
+ drivers/tty/serial/8250/8250_core.c | 1 -
+ drivers/tty/serial/8250/8250_omap.c | 9 +-
+ drivers/tty/serial/8250/8250_pci.c | 76 +++---
+ drivers/tty/serial/8250/8250_pci1xxxx.c | 60 ++++-
+ drivers/tty/serial/8250/8250_port.c | 13 +-
+ drivers/tty/serial/altera_jtaguart.c | 10 +-
+ drivers/tty/serial/altera_uart.c | 7 +-
+ drivers/tty/serial/amba-pl011.c | 126 +++++++---
+ drivers/tty/serial/mpc52xx_uart.c | 2 +-
+ drivers/tty/serial/serial_core.c | 263 +++++++++------------
+ drivers/tty/serial/sh-sci.c | 2 +-
+ drivers/tty/tty_io.c | 2 +-
+ include/linux/pci_ids.h | 11 +
+ 15 files changed, 355 insertions(+), 244 deletions(-)
+Merging char-misc/char-misc-next (148b88be249a MAINTAINERS: add slimbus documentation)
+$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/android/binder.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 3 +
+ Documentation/devicetree/bindings/nvmem/rmem.yaml | 1 +
+ MAINTAINERS | 2 +
+ arch/mips/boot/dts/mobileye/eyeq5.dtsi | 22 ++
+ drivers/android/binder.c | 2 +-
+ drivers/android/binder_alloc.c | 364 +++++++++++++--------
+ drivers/android/binder_alloc.h | 45 ++-
+ drivers/android/binder_alloc_selftest.c | 18 +-
+ drivers/android/binder_trace.h | 2 +-
+ drivers/misc/c2port/core.c | 29 +-
+ drivers/misc/cxl/sysfs.c | 8 +-
+ drivers/misc/ds1682.c | 8 +-
+ drivers/misc/eeprom/idt_89hpesx.c | 6 +-
+ drivers/misc/eeprom/max6875.c | 4 +-
+ drivers/misc/ocxl/sysfs.c | 4 +-
+ drivers/misc/pch_phub.c | 8 +-
+ drivers/misc/sram.c | 8 +-
+ drivers/nvmem/core.c | 35 +-
+ drivers/nvmem/rmem.c | 97 +++++-
+ drivers/slimbus/messaging.c | 2 +-
+ include/linux/miscdevice.h | 2 +-
+ include/linux/nvmem-provider.h | 4 +-
+ 22 files changed, 449 insertions(+), 225 deletions(-)
+Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next)
+$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next
+Already up to date.
+Merging coresight/next (56e14a21cee4 coresight-tpda: Optimize the function of reading element size)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next
+Merge made by the 'ort' strategy.
+ .../sysfs-bus-coresight-devices-dummy-source | 15 +++
+ .../bindings/arm/arm,coresight-dummy-source.yaml | 6 ++
+ .../arm/arm,coresight-static-replicator.yaml | 19 +++-
+ drivers/hwtracing/coresight/coresight-core.c | 113 +++++++++++++++++----
+ drivers/hwtracing/coresight/coresight-dummy.c | 81 +++++++++++++--
+ drivers/hwtracing/coresight/coresight-funnel.c | 6 +-
+ drivers/hwtracing/coresight/coresight-platform.c | 27 +++++
+ drivers/hwtracing/coresight/coresight-replicator.c | 6 +-
+ drivers/hwtracing/coresight/coresight-tpda.c | 19 +++-
+ drivers/hwtracing/coresight/coresight-tpdm.c | 7 +-
+ drivers/hwtracing/coresight/coresight-trace-id.c | 43 +++++---
+ drivers/hwtracing/coresight/coresight-trace-id.h | 9 ++
+ include/linux/coresight.h | 17 +++-
+ 13 files changed, 309 insertions(+), 59 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-dummy-source
+Merging fastrpc/for-next (652631fe700a Merge branch 'fastrpc-for-6.14' into fastrpc-for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next
+Auto-merging drivers/misc/fastrpc.c
+Merge made by the 'ort' strategy.
+ drivers/misc/fastrpc.c | 66 ++++++++++++++++++++++++++------------------------
+ 1 file changed, 34 insertions(+), 32 deletions(-)
+Merging fpga/for-next (46b155acbf4e fpga: dfl: destroy/recreate feature platform device on port release/assign)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next
+Merge made by the 'ort' strategy.
+ drivers/fpga/dfl-afu-dma-region.c | 117 +++++-----
+ drivers/fpga/dfl-afu-error.c | 59 ++---
+ drivers/fpga/dfl-afu-main.c | 278 ++++++++++++------------
+ drivers/fpga/dfl-afu-region.c | 51 ++---
+ drivers/fpga/dfl-afu.h | 26 +--
+ drivers/fpga/dfl-fme-br.c | 24 +-
+ drivers/fpga/dfl-fme-error.c | 98 +++++----
+ drivers/fpga/dfl-fme-main.c | 95 ++++----
+ drivers/fpga/dfl-fme-pr.c | 86 ++++----
+ drivers/fpga/dfl.c | 447 +++++++++++++++++++-------------------
+ drivers/fpga/dfl.h | 142 +++++++-----
+ 11 files changed, 722 insertions(+), 701 deletions(-)
+Merging icc/icc-next (e20f7bfcd21e Merge branch 'icc-fixes' into icc-next)
+$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next
+Merge made by the 'ort' strategy.
+ .../bindings/interconnect/qcom,sm8750-rpmh.yaml | 136 ++
+ drivers/interconnect/qcom/Kconfig | 9 +
+ drivers/interconnect/qcom/Makefile | 2 +
+ drivers/interconnect/qcom/sm8750.c | 1705 ++++++++++++++++++++
+ .../dt-bindings/interconnect/qcom,sm8750-rpmh.h | 143 ++
+ 5 files changed, 1995 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sm8750-rpmh.yaml
+ create mode 100644 drivers/interconnect/qcom/sm8750.c
+ create mode 100644 include/dt-bindings/interconnect/qcom,sm8750-rpmh.h
+Merging iio/togreg (627f3c41ca00 iio: light: veml3235: extend regmap to add cache)
+$ git merge -m Merge branch 'togreg' of git://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/adc/ad4695.c
+Auto-merging drivers/iio/adc/ad7124.c
+Auto-merging drivers/iio/adc/ad7173.c
+Auto-merging drivers/iio/adc/rockchip_saradc.c
+Auto-merging drivers/iio/adc/ti-ads1119.c
+CONFLICT (content): Merge conflict in drivers/iio/adc/ti-ads1119.c
+Auto-merging drivers/iio/inkern.c
+Auto-merging drivers/iio/light/as73211.c
+Auto-merging drivers/iio/light/bh1745.c
+Auto-merging drivers/iio/magnetometer/yamaha-yas530.c
+Auto-merging drivers/iio/temperature/tmp006.c
+Resolved 'drivers/iio/adc/ti-ads1119.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master f50f7f205132] Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-iio | 77 +-
+ .../ABI/testing/sysfs-bus-iio-adc-ad-sigma-delta | 23 +
+ Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192 | 24 -
+ .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 11 +-
+ .../bindings/iio/accel/kionix,kx022a.yaml | 11 +-
+ .../bindings/iio/accel/nxp,fxls8962af.yaml | 20 +-
+ .../devicetree/bindings/iio/adc/adi,ad4000.yaml | 75 +-
+ .../devicetree/bindings/iio/adc/adi,ad4695.yaml | 7 +-
+ .../devicetree/bindings/iio/adc/adi,ad7124.yaml | 13 +
+ .../devicetree/bindings/iio/adc/adi,ad7173.yaml | 12 +
+ .../devicetree/bindings/iio/adc/adi,ad7192.yaml | 15 +
+ .../devicetree/bindings/iio/adc/adi,ad7780.yaml | 11 +
+ .../bindings/iio/adc/renesas,rzg2l-adc.yaml | 37 +-
+ .../bindings/iio/chemical/bosch,bme680.yaml | 62 +
+ .../devicetree/bindings/iio/dac/rohm,bd79703.yaml | 62 +
+ .../devicetree/bindings/iio/imu/adi,adis16480.yaml | 42 +-
+ .../devicetree/bindings/iio/imu/bosch,bmi160.yaml | 1 +
+ .../devicetree/bindings/iio/imu/bosch,bmi270.yaml | 1 +
+ .../devicetree/bindings/iio/imu/bosch,bmi323.yaml | 1 +
+ .../bindings/iio/imu/invensense,mpu6050.yaml | 1 +
+ .../bindings/iio/light/rohm,bu27008.yaml | 49 -
+ .../bindings/iio/light/rohm,bu27010.yaml | 50 -
+ .../devicetree/bindings/iio/light/ti,opt4060.yaml | 51 +
+ .../devicetree/bindings/iio/pressure/bmp085.yaml | 29 +
+ .../devicetree/bindings/trivial-devices.yaml | 2 -
+ Documentation/iio/ad4695.rst | 2 +-
+ Documentation/iio/adis16480.rst | 3 +
+ Documentation/iio/index.rst | 1 +
+ Documentation/iio/opt4060.rst | 61 +
+ MAINTAINERS | 8 +-
+ drivers/iio/accel/adxl345_core.c | 84 +-
+ drivers/iio/accel/bma220_spi.c | 2 +-
+ drivers/iio/accel/fxls8962af-core.c | 14 +
+ drivers/iio/accel/fxls8962af-i2c.c | 2 +
+ drivers/iio/accel/fxls8962af.h | 2 +
+ drivers/iio/accel/kionix-kx022a-i2c.c | 4 +
+ drivers/iio/accel/kionix-kx022a-spi.c | 4 +
+ drivers/iio/accel/kionix-kx022a.c | 169 +-
+ drivers/iio/accel/kionix-kx022a.h | 14 +
+ drivers/iio/adc/ad4000.c | 313 +++-
+ drivers/iio/adc/ad4695.c | 2 +-
+ drivers/iio/adc/ad7124.c | 217 ++-
+ drivers/iio/adc/ad7173.c | 119 +-
+ drivers/iio/adc/ad7192.c | 4 +-
+ drivers/iio/adc/ad7791.c | 1 +
+ drivers/iio/adc/ad7793.c | 3 +-
+ drivers/iio/adc/ad7944.c | 2 +-
+ drivers/iio/adc/ad_sigma_delta.c | 194 ++-
+ drivers/iio/adc/dln2-adc.c | 21 +-
+ drivers/iio/adc/ina2xx-adc.c | 2 +-
+ drivers/iio/adc/max1118.c | 2 +-
+ drivers/iio/adc/max11410.c | 2 +-
+ drivers/iio/adc/max1363.c | 30 +-
+ drivers/iio/adc/mcp3911.c | 2 +-
+ drivers/iio/adc/meson_saradc.c | 47 +-
+ drivers/iio/adc/pac1921.c | 95 +-
+ drivers/iio/adc/rockchip_saradc.c | 2 +-
+ drivers/iio/adc/rtq6056.c | 2 +-
+ drivers/iio/adc/rzg2l_adc.c | 439 +++---
+ drivers/iio/adc/ti-adc081c.c | 2 +-
+ drivers/iio/adc/ti-adc084s021.c | 2 +-
+ drivers/iio/adc/ti-ads1015.c | 2 +-
+ drivers/iio/adc/ti-ads1119.c | 2 +-
+ drivers/iio/adc/ti-ads131e08.c | 2 +-
+ drivers/iio/adc/ti-lmp92064.c | 2 +-
+ drivers/iio/adc/ti-tsc2046.c | 2 +-
+ drivers/iio/adc/vf610_adc.c | 100 +-
+ drivers/iio/buffer/industrialio-buffer-dmaengine.c | 19 +-
+ drivers/iio/chemical/bme680.h | 2 +
+ drivers/iio/chemical/bme680_core.c | 120 +-
+ drivers/iio/chemical/bme680_i2c.c | 1 +
+ drivers/iio/chemical/bme680_spi.c | 1 +
+ drivers/iio/chemical/ccs811.c | 2 +-
+ drivers/iio/chemical/ens160_core.c | 2 +-
+ drivers/iio/chemical/scd30_core.c | 2 +-
+ drivers/iio/chemical/scd4x.c | 2 +-
+ .../iio/common/inv_sensors/inv_sensors_timestamp.c | 4 +-
+ drivers/iio/common/ssp_sensors/ssp_iio.c | 12 +-
+ drivers/iio/dac/Kconfig | 10 +-
+ drivers/iio/dac/Makefile | 1 +
+ drivers/iio/dac/ad5624r.h | 4 +-
+ drivers/iio/dac/ad5686-spi.c | 6 -
+ drivers/iio/dac/ad5686.c | 62 +-
+ drivers/iio/dac/ad5686.h | 6 +-
+ drivers/iio/dac/ad5696-i2c.c | 6 -
+ drivers/iio/dac/ad7293.c | 68 +-
+ drivers/iio/dac/ad8801.c | 79 +-
+ drivers/iio/dac/ltc2632.c | 69 +-
+ drivers/iio/dac/ltc2688.c | 44 +-
+ drivers/iio/dac/max5821.c | 36 +-
+ drivers/iio/dac/mcp4725.c | 2 +-
+ drivers/iio/dac/rohm-bd79703.c | 162 ++
+ drivers/iio/gyro/adxrs290.c | 2 +-
+ drivers/iio/gyro/bmg160_core.c | 2 +-
+ drivers/iio/gyro/itg3200_buffer.c | 2 +-
+ drivers/iio/gyro/mpu3050-core.c | 2 +-
+ drivers/iio/humidity/am2315.c | 2 +-
+ drivers/iio/humidity/hdc100x.c | 2 +-
+ drivers/iio/humidity/hts221.h | 2 +-
+ drivers/iio/imu/adis16480.c | 75 +
+ drivers/iio/imu/bmi323/bmi323_core.c | 2 +-
+ drivers/iio/imu/bno055/bno055.c | 10 +-
+ drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 2 +-
+ drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 2 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 25 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 6 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 5 +
+ drivers/iio/imu/st_lsm6dsx/Kconfig | 18 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c | 6 +-
+ drivers/iio/industrialio-buffer.c | 2 +-
+ drivers/iio/inkern.c | 11 +
+ drivers/iio/light/Kconfig | 31 +-
+ drivers/iio/light/Makefile | 2 +-
+ drivers/iio/light/adjd_s311.c | 2 +-
+ drivers/iio/light/as73211.c | 2 +-
+ drivers/iio/light/bh1745.c | 2 +-
+ drivers/iio/light/cm3232.c | 18 +-
+ drivers/iio/light/isl29125.c | 2 +-
+ drivers/iio/light/ltr501.c | 2 +-
+ drivers/iio/light/max44000.c | 2 +-
+ drivers/iio/light/opt4060.c | 1343 ++++++++++++++++
+ drivers/iio/light/rohm-bu27008.c | 1635 --------------------
+ drivers/iio/light/rohm-bu27034.c | 75 +-
+ drivers/iio/light/rpr0521.c | 2 +-
+ drivers/iio/light/st_uvis25.h | 2 +-
+ drivers/iio/light/tcs3414.c | 2 +-
+ drivers/iio/light/tcs3472.c | 2 +-
+ drivers/iio/light/veml3235.c | 37 +-
+ drivers/iio/light/veml6030.c | 76 +
+ drivers/iio/magnetometer/af8133j.c | 2 +-
+ drivers/iio/magnetometer/ak8974.c | 2 +-
+ drivers/iio/magnetometer/ak8975.c | 2 +-
+ drivers/iio/magnetometer/bmc150_magn.c | 2 +-
+ drivers/iio/magnetometer/hmc5843.h | 2 +-
+ drivers/iio/magnetometer/mag3110.c | 2 +-
+ drivers/iio/magnetometer/yamaha-yas530.c | 2 +-
+ drivers/iio/pressure/bmp280-core.c | 39 +-
+ drivers/iio/pressure/bmp280.h | 8 +-
+ drivers/iio/pressure/hsc030pa.h | 2 +-
+ drivers/iio/pressure/ms5611_core.c | 2 +-
+ drivers/iio/pressure/rohm-bm1390.c | 80 +-
+ drivers/iio/proximity/as3935.c | 2 +-
+ drivers/iio/proximity/aw96103.c | 2 +-
+ drivers/iio/proximity/hx9023s.c | 95 +-
+ drivers/iio/proximity/mb1232.c | 2 +-
+ drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 2 +-
+ drivers/iio/proximity/srf08.c | 2 +-
+ drivers/iio/proximity/sx_common.h | 2 +-
+ drivers/iio/resolver/ad2s1210.c | 2 +-
+ drivers/iio/temperature/tmp006.c | 2 +-
+ drivers/iio/trigger/stm32-timer-trigger.c | 69 +-
+ include/dt-bindings/iio/{ => adc}/adi,ad4695.h | 0
+ include/linux/iio/adc/ad_sigma_delta.h | 10 +-
+ include/linux/iio/buffer.h | 2 +-
+ include/linux/iio/consumer.h | 4 +-
+ include/linux/iio/iio-opaque.h | 2 +-
+ include/linux/iio/iio.h | 2 +-
+ include/linux/iio/imu/adis.h | 1 -
+ include/linux/iio/timer/stm32-timer-trigger.h | 6 +
+ 160 files changed, 4150 insertions(+), 3011 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-ad-sigma-delta
+ create mode 100644 Documentation/devicetree/bindings/iio/chemical/bosch,bme680.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/dac/rohm,bd79703.yaml
+ delete mode 100644 Documentation/devicetree/bindings/iio/light/rohm,bu27008.yaml
+ delete mode 100644 Documentation/devicetree/bindings/iio/light/rohm,bu27010.yaml
+ create mode 100644 Documentation/devicetree/bindings/iio/light/ti,opt4060.yaml
+ create mode 100644 Documentation/iio/opt4060.rst
+ create mode 100644 drivers/iio/dac/rohm-bd79703.c
+ create mode 100644 drivers/iio/light/opt4060.c
+ delete mode 100644 drivers/iio/light/rohm-bu27008.c
+ rename include/dt-bindings/iio/{ => adc}/adi,ad4695.h (100%)
+Merging phy-next/next (af1bc0ebe743 dt-bindings: phy: qcom,qmp-pcie: document the SM8350 two lanes PCIe PHY)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next
+Auto-merging Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
+Auto-merging MAINTAINERS
+Auto-merging drivers/phy/freescale/phy-fsl-samsung-hdmi.c
+Auto-merging drivers/phy/phy-core.c
+Auto-merging drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+Auto-merging drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
+Merge made by the 'ort' strategy.
+ .../bindings/phy/phy-rockchip-naneng-combphy.yaml | 1 +
+ .../bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml | 21 +-
+ .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 +
+ .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 6 +
+ .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 2 +
+ .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 2 +
+ MAINTAINERS | 1 -
+ drivers/phy/allwinner/phy-sun4i-usb.c | 1 -
+ drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 47 ++--
+ drivers/phy/hisilicon/phy-hi3670-pcie.c | 11 +-
+ drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 2 +-
+ drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c | 44 ++++
+ drivers/phy/mediatek/phy-mtk-hdmi-mt8195.h | 3 +
+ drivers/phy/mediatek/phy-mtk-hdmi.c | 28 +++
+ drivers/phy/mediatek/phy-mtk-hdmi.h | 4 +
+ drivers/phy/phy-core.c | 23 +-
+ drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 100 ++++++++
+ drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 278 +++++++++++++++++++-
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v4_20.h | 5 +-
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h | 5 +-
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6.h | 3 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-v2.h | 1 +
+ drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6.h | 2 +
+ .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6.h | 1 +
+ drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 3 +
+ drivers/phy/qualcomm/phy-qcom-qusb2.c | 55 ++++
+ drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 279 +++++++++++++++++++++
+ drivers/phy/rockchip/phy-rockchip-pcie.c | 146 ++++-------
+ drivers/phy/rockchip/phy-rockchip-typec.c | 2 +-
+ drivers/phy/samsung/Kconfig | 1 +
+ drivers/phy/samsung/phy-samsung-ufs.c | 6 +-
+ drivers/phy/tegra/Kconfig | 5 +-
+ 32 files changed, 920 insertions(+), 169 deletions(-)
+Merging soundwire/next (74148bb59e20 soundwire: amd: clear wake enable register for power off mode)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next
+Auto-merging drivers/soundwire/amd_manager.c
+Auto-merging drivers/soundwire/qcom.c
+Merge made by the 'ort' strategy.
+ drivers/soundwire/amd_manager.c | 5 +-
+ drivers/soundwire/bus.c | 65 +++--
+ drivers/soundwire/bus.h | 3 +
+ drivers/soundwire/bus_type.c | 3 -
+ drivers/soundwire/generic_bandwidth_allocation.c | 316 +++++++++++++++++++----
+ drivers/soundwire/irq.c | 12 +-
+ drivers/soundwire/irq.h | 5 -
+ drivers/soundwire/mipi_disco.c | 40 ++-
+ drivers/soundwire/qcom.c | 2 +-
+ drivers/soundwire/stream.c | 71 ++++-
+ include/linux/soundwire/sdw.h | 154 +++++------
+ 11 files changed, 513 insertions(+), 163 deletions(-)
+Merging extcon/extcon-next (7041ed0dde83 extcon: Drop explicit initialization of struct i2c_device_id::driver_data to 0)
+$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/extcon/extcon-rtk-type-c.c
+Merge made by the 'ort' strategy.
+ Documentation/driver-api/extcon.rst | 255 ++++++++++++++++++++++++++++++++++++
+ Documentation/driver-api/index.rst | 1 +
+ MAINTAINERS | 1 +
+ drivers/extcon/extcon-fsa9480.c | 2 +-
+ drivers/extcon/extcon-ptn5150.c | 2 +-
+ drivers/extcon/extcon-rtk-type-c.c | 2 +
+ 6 files changed, 261 insertions(+), 2 deletions(-)
+ create mode 100644 Documentation/driver-api/extcon.rst
+Merging gnss/gnss-next (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next
+Already up to date.
+Merging vfio/next (fe4bf8d0b671 vfio/pci: Properly hide first-in-list PCIe extended capability)
+$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next
+Already up to date.
+Merging w1/for-next (419a40cc2bdd w1: core: use sysfs_emit() instead of sprintf())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/w1/maxim,ds2482.yaml | 2 ++
+ drivers/w1/masters/ds2482.c | 26 +++++++-------
+ drivers/w1/slaves/w1_ds2406.c | 10 +++---
+ drivers/w1/slaves/w1_ds2408.c | 42 +++++++++++-----------
+ drivers/w1/slaves/w1_ds2413.c | 14 ++++----
+ drivers/w1/slaves/w1_ds2430.c | 10 +++---
+ drivers/w1/slaves/w1_ds2431.c | 10 +++---
+ drivers/w1/slaves/w1_ds2433.c | 24 ++++++-------
+ drivers/w1/slaves/w1_ds2438.c | 34 +++++++++---------
+ drivers/w1/slaves/w1_ds2780.c | 8 ++---
+ drivers/w1/slaves/w1_ds2781.c | 8 ++---
+ drivers/w1/slaves/w1_ds2805.c | 10 +++---
+ drivers/w1/slaves/w1_ds28e04.c | 18 +++++-----
+ drivers/w1/slaves/w1_ds28e17.c | 4 +--
+ drivers/w1/w1.c | 12 +++----
+ 15 files changed, 116 insertions(+), 116 deletions(-)
+Merging spmi/spmi-next (a45e4aa263d6 spmi: Set fwnode for spmi devices)
+$ git merge -m Merge branch 'spmi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next
+Merge made by the 'ort' strategy.
+ drivers/spmi/spmi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging staging/staging-next (33bd6465275a staging: vme_user: vme_tsi148.c: avoid parenthesis line ending)
+$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next
+Auto-merging drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
+Auto-merging drivers/staging/gpib/tnt4882/mite.h
+Merge made by the 'ort' strategy.
+ drivers/staging/fbtft/fb_ssd1351.c | 3 +-
+ drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 2 -
+ drivers/staging/gpib/ni_usb/ni_usb_gpib.c | 16 +++----
+ drivers/staging/gpib/ni_usb/ni_usb_gpib.h | 2 +-
+ drivers/staging/gpib/tnt4882/mite.c | 2 +-
+ drivers/staging/gpib/tnt4882/mite.h | 2 +-
+ drivers/staging/rtl8723bs/core/rtw_io.c | 10 ++--
+ drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 1 -
+ drivers/staging/rtl8723bs/core/rtw_xmit.c | 6 ++-
+ drivers/staging/rtl8723bs/hal/hal_com.c | 55 ----------------------
+ drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c | 4 --
+ drivers/staging/rtl8723bs/include/hal_com.h | 5 --
+ drivers/staging/rtl8723bs/include/hal_intf.h | 1 -
+ drivers/staging/rtl8723bs/include/rtw_recv.h | 18 -------
+ drivers/staging/vme_user/vme_tsi148.c | 3 +-
+ 15 files changed, 23 insertions(+), 107 deletions(-)
+Merging counter-next/counter-next (fac04efc5c79 Linux 6.13-rc2)
+$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next
+Already up to date.
+Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions)
+$ git merge -m Merge branch 'siox/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git siox/siox/for-next
+Already up to date.
+Merging mux/for-next (49a9b01803e4 mux: constify mux class)
+$ 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/core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging dmaengine/next (98d187a98903 dmaengine: idxd: Enable Function Level Reset (FLR) for halt)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next
+Auto-merging MAINTAINERS
+Auto-merging drivers/dma/idxd/init.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/dma/adi,axi-dmac.txt | 61 ---
+ .../devicetree/bindings/dma/adi,axi-dmac.yaml | 129 ++++++
+ .../bindings/dma/allwinner,sun4i-a10-dma.yaml | 4 +-
+ .../devicetree/bindings/dma/atmel,sama5d4-dma.yaml | 79 ++++
+ .../devicetree/bindings/dma/atmel-xdma.txt | 54 ---
+ .../devicetree/bindings/dma/fsl,edma.yaml | 34 ++
+ .../bindings/dma/nvidia,tegra210-adma.yaml | 60 ++-
+ .../devicetree/bindings/dma/qcom,gpi.yaml | 4 +
+ .../bindings/dma/stm32/st,stm32-dmamux.yaml | 10 +
+ .../devicetree/bindings/dma/ti/k3-bcdma.yaml | 5 +-
+ MAINTAINERS | 10 +-
+ drivers/dma/Kconfig | 6 +-
+ drivers/dma/Makefile | 1 -
+ drivers/dma/amd/Kconfig | 28 ++
+ drivers/dma/amd/Makefile | 2 +
+ drivers/dma/amd/ae4dma/Makefile | 10 +
+ drivers/dma/amd/ae4dma/ae4dma-dev.c | 157 +++++++
+ drivers/dma/amd/ae4dma/ae4dma-pci.c | 158 +++++++
+ drivers/dma/amd/ae4dma/ae4dma.h | 100 +++++
+ drivers/dma/{ => amd}/ptdma/Makefile | 0
+ drivers/dma/{ => amd}/ptdma/ptdma-debugfs.c | 75 +++-
+ drivers/dma/{ => amd}/ptdma/ptdma-dev.c | 0
+ drivers/dma/{ => amd}/ptdma/ptdma-dmaengine.c | 226 +++++++++-
+ drivers/dma/{ => amd}/ptdma/ptdma-pci.c | 0
+ drivers/dma/{ => amd}/ptdma/ptdma.h | 4 +-
+ drivers/dma/amd/qdma/qdma.c | 22 +-
+ drivers/dma/bcm2835-dma.c | 22 +
+ drivers/dma/fsl-edma-common.c | 36 +-
+ drivers/dma/fsl-edma-common.h | 3 +
+ drivers/dma/fsl-edma-main.c | 115 ++++-
+ drivers/dma/idxd/cdev.c | 5 -
+ drivers/dma/idxd/idxd.h | 15 +-
+ drivers/dma/idxd/init.c | 481 +++++++++++++++++++--
+ drivers/dma/idxd/irq.c | 85 ++--
+ drivers/dma/idxd/registers.h | 1 +
+ drivers/dma/idxd/sysfs.c | 10 -
+ drivers/dma/mv_xor.c | 5 +-
+ drivers/dma/ptdma/Kconfig | 13 -
+ drivers/dma/qcom/bam_dma.c | 24 +-
+ drivers/dma/qcom/gpi.c | 31 +-
+ drivers/dma/sh/rcar-dmac.c | 4 +
+ drivers/dma/sun4i-dma.c | 208 +++++++--
+ drivers/dma/tegra210-adma.c | 86 +++-
+ drivers/dma/ti/edma.c | 7 +-
+ drivers/dma/ti/k3-udma.c | 16 +
+ drivers/dma/xilinx/xdma.c | 8 +-
+ drivers/dma/xilinx/xilinx_dma.c | 20 +-
+ 47 files changed, 2059 insertions(+), 375 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/dma/adi,axi-dmac.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/adi,axi-dmac.yaml
+ create mode 100644 Documentation/devicetree/bindings/dma/atmel,sama5d4-dma.yaml
+ delete mode 100644 Documentation/devicetree/bindings/dma/atmel-xdma.txt
+ create mode 100644 drivers/dma/amd/ae4dma/Makefile
+ create mode 100644 drivers/dma/amd/ae4dma/ae4dma-dev.c
+ create mode 100644 drivers/dma/amd/ae4dma/ae4dma-pci.c
+ create mode 100644 drivers/dma/amd/ae4dma/ae4dma.h
+ rename drivers/dma/{ => amd}/ptdma/Makefile (100%)
+ rename drivers/dma/{ => amd}/ptdma/ptdma-debugfs.c (52%)
+ rename drivers/dma/{ => amd}/ptdma/ptdma-dev.c (100%)
+ rename drivers/dma/{ => amd}/ptdma/ptdma-dmaengine.c (59%)
+ rename drivers/dma/{ => amd}/ptdma/ptdma-pci.c (100%)
+ rename drivers/dma/{ => amd}/ptdma/ptdma.h (99%)
+ delete mode 100644 drivers/dma/ptdma/Kconfig
+Merging cgroup/for-next (9b496a8bbed9 cgroup/cpuset: Prevent leakage of isolated CPUs into sched domains)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next
+Merge made by the 'ort' strategy.
+ kernel/cgroup/cpuset.c | 19 +++++++------
+ tools/testing/selftests/cgroup/test_cpuset_prs.sh | 33 +++++++++++++----------
+ 2 files changed, 30 insertions(+), 22 deletions(-)
+Merging scsi/for-next (1fb3855b8a12 Merge branch 'fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next
+Auto-merging drivers/ata/sata_sil24.c
+Auto-merging drivers/infiniband/ulp/srp/ib_srp.c
+Auto-merging drivers/scsi/arcmsr/arcmsr_hba.c
+Auto-merging drivers/scsi/fnic/fnic_main.c
+Auto-merging drivers/scsi/hisi_sas/hisi_sas.h
+Auto-merging drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c
+Auto-merging drivers/scsi/mpi3mr/mpi3mr_os.c
+Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c
+Auto-merging drivers/scsi/pm8001/pm8001_sas.h
+Auto-merging drivers/scsi/qla2xxx/qla_os.c
+Auto-merging drivers/scsi/qla4xxx/ql4_os.c
+Auto-merging drivers/scsi/smartpqi/smartpqi_init.c
+Auto-merging drivers/scsi/virtio_scsi.c
+Auto-merging drivers/ufs/core/ufshcd.c
+Auto-merging drivers/usb/storage/uas.c
+Auto-merging include/ufs/ufshcd.h
+Merge made by the 'ort' strategy.
+ Documentation/scsi/scsi_mid_low_api.rst | 78 ++++----
+ drivers/ata/ahci.h | 2 +-
+ drivers/ata/libata-sata.c | 8 +-
+ drivers/ata/libata-scsi.c | 19 +-
+ drivers/ata/pata_macio.c | 8 +-
+ drivers/ata/sata_mv.c | 2 +-
+ drivers/ata/sata_nv.c | 24 +--
+ drivers/ata/sata_sil24.c | 2 +-
+ drivers/firewire/sbp2.c | 10 +-
+ drivers/infiniband/ulp/srp/ib_srp.c | 5 +-
+ drivers/message/fusion/mptfc.c | 14 +-
+ drivers/message/fusion/mptsas.c | 14 +-
+ drivers/message/fusion/mptscsih.c | 10 +-
+ drivers/message/fusion/mptscsih.h | 5 +-
+ drivers/message/fusion/mptspi.c | 19 +-
+ drivers/s390/scsi/zfcp_scsi.c | 15 +-
+ drivers/s390/scsi/zfcp_sysfs.c | 2 +-
+ drivers/s390/scsi/zfcp_unit.c | 2 +-
+ drivers/scsi/3w-9xxx.c | 7 +-
+ drivers/scsi/3w-sas.c | 7 +-
+ drivers/scsi/3w-xxxx.c | 8 +-
+ drivers/scsi/53c700.c | 19 +-
+ drivers/scsi/BusLogic.c | 7 +-
+ drivers/scsi/BusLogic.h | 3 +-
+ drivers/scsi/aacraid/linit.c | 8 +-
+ drivers/scsi/advansys.c | 23 +--
+ drivers/scsi/aic7xxx/aic79xx_osm.c | 8 +-
+ drivers/scsi/aic7xxx/aic7xxx_osm.c | 8 +-
+ drivers/scsi/arcmsr/arcmsr_hba.c | 8 +-
+ drivers/scsi/bfa/bfad_im.c | 26 +--
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 7 +-
+ drivers/scsi/csiostor/csio_scsi.c | 20 +--
+ drivers/scsi/dc395x.c | 12 +-
+ drivers/scsi/esp_scsi.c | 14 +-
+ drivers/scsi/fcoe/fcoe.c | 2 +-
+ drivers/scsi/fnic/fnic_main.c | 4 +-
+ drivers/scsi/fnic/fnic_trace.c | 16 +-
+ drivers/scsi/hisi_sas/hisi_sas.h | 5 +-
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 13 +-
+ drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 4 +-
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 4 +-
+ drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10 +-
+ drivers/scsi/hpsa.c | 20 ++-
+ drivers/scsi/hptiop.c | 6 +-
+ drivers/scsi/ibmvscsi/ibmvfc.c | 14 +-
+ drivers/scsi/ibmvscsi/ibmvscsi.c | 8 +-
+ drivers/scsi/ipr.c | 20 +--
+ drivers/scsi/ips.c | 6 +-
+ drivers/scsi/ips.h | 3 +-
+ drivers/scsi/iscsi_tcp.c | 6 +-
+ drivers/scsi/libfc/fc_fcp.c | 6 +-
+ drivers/scsi/libsas/sas_scsi_host.c | 11 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 37 ++--
+ drivers/scsi/megaraid/megaraid_sas_base.c | 14 +-
+ drivers/scsi/mpi3mr/mpi3mr_os.c | 20 +--
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 24 +--
+ drivers/scsi/mvumi.c | 5 +-
+ drivers/scsi/myrb.c | 21 +--
+ drivers/scsi/myrs.c | 13 +-
+ drivers/scsi/ncr53c8xx.c | 9 +-
+ drivers/scsi/pm8001/pm8001_defs.h | 2 +-
+ drivers/scsi/pm8001/pm8001_hwi.c | 5 +-
+ drivers/scsi/pm8001/pm8001_sas.c | 78 ++++++--
+ drivers/scsi/pm8001/pm8001_sas.h | 2 +
+ drivers/scsi/pm8001/pm80xx_hwi.c | 59 +++++--
+ drivers/scsi/pmcraid.c | 22 +--
+ drivers/scsi/ps3rom.c | 5 +-
+ drivers/scsi/qedf/qedf_main.c | 5 +-
+ drivers/scsi/qla1280.c | 6 +-
+ drivers/scsi/qla2xxx/qla_def.h | 2 +
+ drivers/scsi/qla2xxx/qla_dfs.c | 122 ++++++++++---
+ drivers/scsi/qla2xxx/qla_gbl.h | 3 +
+ drivers/scsi/qla2xxx/qla_init.c | 28 ++-
+ drivers/scsi/qla2xxx/qla_os.c | 12 +-
+ drivers/scsi/qla4xxx/ql4_os.c | 6 +-
+ drivers/scsi/qlogicpti.c | 5 +-
+ drivers/scsi/scsi_debug.c | 19 +-
+ drivers/scsi/scsi_scan.c | 22 ++-
+ drivers/scsi/scsi_sysfs.c | 4 +-
+ drivers/scsi/smartpqi/smartpqi_init.c | 13 +-
+ drivers/scsi/snic/snic_main.c | 12 +-
+ drivers/scsi/stex.c | 4 +-
+ drivers/scsi/storvsc_drv.c | 7 +-
+ drivers/scsi/sym53c8xx_2/sym_glue.c | 15 +-
+ drivers/scsi/virtio_scsi.c | 2 +-
+ drivers/scsi/xen-scsifront.c | 11 +-
+ drivers/ufs/core/ufshcd.c | 285 +++++++++++++++---------------
+ drivers/usb/image/microtek.c | 4 +-
+ drivers/usb/storage/scsiglue.c | 10 +-
+ drivers/usb/storage/uas.c | 10 +-
+ include/linux/libata.h | 19 +-
+ include/scsi/libfc.h | 2 +-
+ include/scsi/libsas.h | 9 +-
+ include/scsi/scsi_bsg_iscsi.h | 2 +-
+ include/scsi/scsi_device.h | 4 +-
+ include/scsi/scsi_host.h | 24 ++-
+ include/ufs/ufshcd.h | 25 ++-
+ 97 files changed, 888 insertions(+), 702 deletions(-)
+Merging scsi-mkp/for-next (9673c075d8ee scsi: documentation: Corrections for struct updates)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/scsi/arcmsr/arcmsr_hba.c
+Auto-merging drivers/scsi/cxlflash/main.c
+Auto-merging drivers/scsi/fnic/fnic_main.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging drivers/scsi/lpfc/lpfc_nportdisc.c
+Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c
+Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c
+Auto-merging drivers/scsi/pm8001/pm8001_init.c
+Auto-merging drivers/scsi/qla2xxx/qla_attr.c
+Auto-merging drivers/scsi/qla2xxx/qla_os.c
+Auto-merging drivers/scsi/qla4xxx/ql4_os.c
+Auto-merging drivers/scsi/scsi_debug.c
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/scsi/scsi_transport_iscsi.c
+Auto-merging drivers/scsi/storvsc_drv.c
+Auto-merging drivers/ufs/core/ufshcd.c
+Auto-merging drivers/ufs/host/ufs-qcom.c
+CONFLICT (content): Merge conflict in drivers/ufs/host/ufs-qcom.c
+Auto-merging include/scsi/scsi_transport_iscsi.h
+Auto-merging include/ufs/ufshcd.h
+Recorded preimage for 'drivers/ufs/host/ufs-qcom.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'drivers/ufs/host/ufs-qcom.c'.
+[master 0a7a7958f6ee] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/driver-api/scsi.rst | 5 +-
+ Documentation/scsi/scsi_eh.rst | 46 +-
+ Documentation/scsi/scsi_mid_low_api.rst | 128 +-
+ MAINTAINERS | 6 +-
+ drivers/s390/scsi/zfcp_fc.c | 7 +-
+ drivers/s390/scsi/zfcp_fsf.c | 4 +-
+ drivers/scsi/3w-9xxx.c | 2 +-
+ drivers/scsi/3w-sas.c | 14 +-
+ drivers/scsi/3w-xxxx.c | 2 +-
+ drivers/scsi/BusLogic.c | 2 +-
+ drivers/scsi/a100u2w.c | 2 +-
+ drivers/scsi/advansys.c | 2 +-
+ drivers/scsi/am53c974.c | 2 +-
+ drivers/scsi/arcmsr/arcmsr_attr.c | 12 +-
+ drivers/scsi/arcmsr/arcmsr_hba.c | 2 +-
+ drivers/scsi/atp870u.c | 2 +-
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 7 +-
+ drivers/scsi/bnx2i/bnx2i_init.c | 7 +-
+ drivers/scsi/cxlflash/main.c | 2 +-
+ drivers/scsi/dc395x.c | 2 +-
+ drivers/scsi/dmx3191d.c | 2 +-
+ drivers/scsi/elx/efct/efct_driver.c | 2 +-
+ drivers/scsi/esas2r/esas2r.h | 12 +-
+ drivers/scsi/esas2r/esas2r_main.c | 32 +-
+ drivers/scsi/esp_scsi.h | 2 +-
+ drivers/scsi/fdomain_pci.c | 2 +-
+ drivers/scsi/fnic/Makefile | 5 +-
+ drivers/scsi/fnic/fdls_disc.c | 5019 ++++++++++++++++++++++++
+ drivers/scsi/fnic/fdls_fc.h | 253 ++
+ drivers/scsi/fnic/fip.c | 1008 +++++
+ drivers/scsi/fnic/fip.h | 157 +
+ drivers/scsi/fnic/fnic.h | 290 +-
+ drivers/scsi/fnic/fnic_attrs.c | 12 +-
+ drivers/scsi/fnic/fnic_debugfs.c | 30 +-
+ drivers/scsi/fnic/fnic_fcs.c | 1777 ++++-----
+ drivers/scsi/fnic/fnic_fdls.h | 434 ++
+ drivers/scsi/fnic/fnic_fip.h | 48 -
+ drivers/scsi/fnic/fnic_io.h | 14 +-
+ drivers/scsi/fnic/fnic_isr.c | 28 +-
+ drivers/scsi/fnic/fnic_main.c | 739 ++--
+ drivers/scsi/fnic/fnic_pci_subsys_devid.c | 131 +
+ drivers/scsi/fnic/fnic_res.c | 77 +-
+ drivers/scsi/fnic/fnic_scsi.c | 1163 +++---
+ drivers/scsi/fnic/fnic_stats.h | 49 +-
+ drivers/scsi/fnic/fnic_trace.c | 81 +-
+ drivers/scsi/hptiop.c | 2 +-
+ drivers/scsi/ibmvscsi/ibmvfc.c | 6 +-
+ drivers/scsi/initio.c | 2 +-
+ drivers/scsi/ipr.c | 28 +-
+ drivers/scsi/isci/remote_device.c | 29 -
+ drivers/scsi/isci/remote_device.h | 17 -
+ drivers/scsi/lpfc/lpfc_attr.c | 20 +-
+ drivers/scsi/lpfc/lpfc_bsg.c | 210 +-
+ drivers/scsi/lpfc/lpfc_bsg.h | 19 +-
+ drivers/scsi/lpfc/lpfc_ct.c | 6 +-
+ drivers/scsi/lpfc/lpfc_disc.h | 11 +-
+ drivers/scsi/lpfc/lpfc_els.c | 55 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 13 +-
+ drivers/scsi/lpfc/lpfc_hw.h | 3 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 85 +-
+ drivers/scsi/lpfc/lpfc_init.c | 11 +-
+ drivers/scsi/lpfc/lpfc_mbox.c | 6 +-
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 49 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 27 +-
+ drivers/scsi/lpfc/lpfc_sli4.h | 2 -
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/lpfc/lpfc_vport.c | 22 +-
+ drivers/scsi/megaraid.c | 2 +-
+ drivers/scsi/megaraid/megaraid_mbox.c | 4 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 2 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 5 +-
+ drivers/scsi/mvsas/mv_init.c | 2 +-
+ drivers/scsi/myrb.c | 2 -
+ drivers/scsi/nsp32.c | 2 +-
+ drivers/scsi/pm8001/pm8001_init.c | 2 +-
+ drivers/scsi/pmcraid.c | 2 +-
+ drivers/scsi/qedf/qedf_attr.c | 10 +-
+ drivers/scsi/qedf/qedf_dbg.h | 2 +-
+ drivers/scsi/qedi/qedi_dbg.h | 2 +-
+ drivers/scsi/qedi/qedi_main.c | 8 +-
+ drivers/scsi/qla1280.c | 2 +-
+ drivers/scsi/qla2xxx/qla_attr.c | 80 +-
+ drivers/scsi/qla2xxx/qla_os.c | 2 +-
+ drivers/scsi/qla4xxx/ql4_attr.c | 12 +-
+ drivers/scsi/qla4xxx/ql4_os.c | 2 +-
+ drivers/scsi/scsi_debug.c | 1 +
+ drivers/scsi/scsi_error.c | 26 +-
+ drivers/scsi/scsi_ioctl.c | 35 +-
+ drivers/scsi/scsi_lib.c | 21 +-
+ drivers/scsi/scsi_scan.c | 20 +
+ drivers/scsi/scsi_sysfs.c | 16 +-
+ drivers/scsi/scsi_transport_iscsi.c | 27 -
+ drivers/scsi/scsi_transport_sas.c | 10 +-
+ drivers/scsi/scsi_transport_spi.c | 3 +-
+ drivers/scsi/snic/snic_main.c | 2 +-
+ drivers/scsi/stex.c | 2 +-
+ drivers/scsi/storvsc_drv.c | 13 +-
+ drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +-
+ drivers/target/iscsi/iscsi_target.c | 15 -
+ drivers/target/iscsi/iscsi_target.h | 1 -
+ drivers/target/iscsi/iscsi_target_erl2.c | 48 -
+ drivers/target/iscsi/iscsi_target_erl2.h | 2 -
+ drivers/target/iscsi/iscsi_target_parameters.c | 48 -
+ drivers/target/iscsi/iscsi_target_parameters.h | 3 -
+ drivers/target/iscsi/iscsi_target_tpg.c | 5 -
+ drivers/target/iscsi/iscsi_target_tpg.h | 1 -
+ drivers/target/iscsi/iscsi_target_util.c | 58 -
+ drivers/target/iscsi/iscsi_target_util.h | 2 -
+ drivers/ufs/core/ufshcd-crypto.c | 26 +-
+ drivers/ufs/core/ufshcd.c | 10 +-
+ drivers/ufs/host/ufs-qcom.c | 93 +-
+ include/scsi/scsi_host.h | 2 +-
+ include/scsi/scsi_transport_iscsi.h | 4 -
+ include/ufs/ufshcd.h | 11 +-
+ 114 files changed, 10105 insertions(+), 2793 deletions(-)
+ create mode 100644 drivers/scsi/fnic/fdls_disc.c
+ create mode 100644 drivers/scsi/fnic/fdls_fc.h
+ create mode 100644 drivers/scsi/fnic/fip.c
+ create mode 100644 drivers/scsi/fnic/fip.h
+ create mode 100644 drivers/scsi/fnic/fnic_fdls.h
+ delete mode 100644 drivers/scsi/fnic/fnic_fip.h
+ create mode 100644 drivers/scsi/fnic/fnic_pci_subsys_devid.c
+Merging vhost/linux-next (6a39bb15b3d1 virtio_vdpa: remove redundant check on desc)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next
+Already up to date.
+Merging rpmsg/for-next (dbb9c372555c remoteproc: mtk_scp: Only populate devices for SCP cores)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next
+Merge made by the 'ort' strategy.
+ drivers/remoteproc/mtk_scp.c | 12 ++++++++++--
+ drivers/remoteproc/omap_remoteproc.c | 17 +++++++++++++++++
+ drivers/remoteproc/remoteproc_core.c | 14 +++++++-------
+ 3 files changed, 34 insertions(+), 9 deletions(-)
+Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next
+Already up to date.
+Merging gpio-brgl/gpio/for-next (b97263d14cd6 dt-bindings: gpio: fairchild,74hc595: Document chip select vs. latch clock)
+$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next
+Auto-merging drivers/gpio/Kconfig
+Merge made by the 'ort' strategy.
+ .../bindings/gpio/brcm,brcmstb-gpio.yaml | 4 +
+ .../bindings/gpio/fairchild,74hc595.yaml | 18 ++
+ drivers/gpio/Kconfig | 4 +-
+ drivers/gpio/gpio-74x164.c | 2 +
+ drivers/gpio/gpio-pca953x.c | 3 +-
+ drivers/gpio/gpio-tps65219.c | 12 +-
+ drivers/gpio/gpio-tqmx86.c | 206 ++++++++++++---------
+ drivers/gpio/gpio-twl6040.c | 6 +-
+ 8 files changed, 155 insertions(+), 100 deletions(-)
+Merging gpio-intel/for-next (12b0e305f509 gpio: acpi: switch to device_for_each_child_node_scoped())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next
+Already up to date.
+Merging pinctrl/for-next (e5fc03a0d7c6 Merge branch 'devel' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/pinctrl/mediatek,mt7988-pinctrl.yaml | 575 +++++++
+ .../bindings/pinctrl/qcom,ipq5424-tlmm.yaml | 4 +-
+ .../bindings/pinctrl/qcom,msm8917-pinctrl.yaml | 160 ++
+ .../bindings/pinctrl/rockchip,pinctrl.yaml | 1 +
+ drivers/pinctrl/core.c | 50 +-
+ drivers/pinctrl/mediatek/Kconfig | 7 +
+ drivers/pinctrl/mediatek/Makefile | 1 +
+ drivers/pinctrl/mediatek/pinctrl-mt7988.c | 1556 +++++++++++++++++++
+ drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 73 +-
+ drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h | 1 +
+ drivers/pinctrl/nomadik/pinctrl-nomadik.c | 35 +-
+ drivers/pinctrl/pinctrl-ingenic.c | 2 +-
+ drivers/pinctrl/pinctrl-ocelot.c | 20 +-
+ drivers/pinctrl/pinctrl-rockchip.c | 200 ++-
+ drivers/pinctrl/pinctrl-rockchip.h | 3 +-
+ drivers/pinctrl/qcom/Kconfig.msm | 6 +
+ drivers/pinctrl/qcom/Makefile | 1 +
+ drivers/pinctrl/qcom/pinctrl-ipq5424.c | 34 +-
+ drivers/pinctrl/qcom/pinctrl-msm8917.c | 1620 ++++++++++++++++++++
+ drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 +
+ drivers/pinctrl/samsung/pinctrl-exynos.c | 3 +-
+ drivers/pinctrl/samsung/pinctrl-samsung.c | 4 +-
+ 22 files changed, 4293 insertions(+), 65 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt7988-pinctrl.yaml
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8917-pinctrl.yaml
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7988.c
+ create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8917.c
+$ git reset --hard HEAD^
+HEAD is now at 4eac655a927e Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
+Merging next-20241220 version of pinctrl
+$ git merge -m next-20241220/pinctrl 38867d5de5f12203154762b7ec3008a8c93150cd
+Merge made by the 'ort' strategy.
+ .../bindings/pinctrl/qcom,ipq5424-tlmm.yaml | 4 +-
+ .../bindings/pinctrl/qcom,msm8917-pinctrl.yaml | 160 ++
+ drivers/pinctrl/nomadik/pinctrl-nomadik.c | 35 +-
+ drivers/pinctrl/pinctrl-ingenic.c | 2 +-
+ drivers/pinctrl/qcom/Kconfig.msm | 6 +
+ drivers/pinctrl/qcom/Makefile | 1 +
+ drivers/pinctrl/qcom/pinctrl-ipq5424.c | 34 +-
+ drivers/pinctrl/qcom/pinctrl-msm8917.c | 1620 ++++++++++++++++++++
+ 8 files changed, 1844 insertions(+), 18 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8917-pinctrl.yaml
+ create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8917.c
+Merging pinctrl-intel/for-next (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next
+Already up to date.
+Merging pinctrl-renesas/renesas-pinctrl (829356da700b pinctrl: renesas: rzg2l: Add support for RZ/G3E SoC)
+$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl
+Merge made by the 'ort' strategy.
+ drivers/pinctrl/renesas/Kconfig | 1 +
+ drivers/pinctrl/renesas/pinctrl-rzg2l.c | 188 +++++++++++++++++++++++++++++++-
+ 2 files changed, 183 insertions(+), 6 deletions(-)
+Merging pinctrl-samsung/for-next (0ebb1e9e1b12 pinctrl: samsung: update child reference drop comment)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
+Merge made by the 'ort' strategy.
+ drivers/pinctrl/samsung/pinctrl-exynos.c | 3 ++-
+ drivers/pinctrl/samsung/pinctrl-samsung.c | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+Merging pwm/pwm/for-next (cce16e7f6216 pwm: stm32-lp: Add check for clk_enable())
+$ git merge -m Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next
+Auto-merging drivers/pwm/pwm-lpss-pci.c
+Merge made by the 'ort' strategy.
+ .../bindings/pwm/marvell,berlin-pwm.yaml | 44 +++++++++++++++
+ .../devicetree/bindings/pwm/pwm-berlin.txt | 17 ------
+ Documentation/devicetree/bindings/pwm/pwm-sprd.txt | 40 -------------
+ .../devicetree/bindings/pwm/sprd,ums512-pwm.yaml | 66 ++++++++++++++++++++++
+ drivers/pwm/pwm-dwc.c | 14 ++---
+ drivers/pwm/pwm-lpss-pci.c | 9 +--
+ drivers/pwm/pwm-stm32-lp.c | 8 ++-
+ 7 files changed, 126 insertions(+), 72 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pwm/marvell,berlin-pwm.yaml
+ delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-berlin.txt
+ delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-sprd.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/sprd,ums512-pwm.yaml
+Merging ktest/for-next (2351e8c65404 ktest.pl: Avoid false positives with grub2 skip regex)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next
+Already up to date.
+Merging kselftest/next (2f32bdc4bbcd selftests/ring-buffer: Add test for out-of-bound pgoff mapping)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
+Merge made by the 'ort' strategy.
+ tools/testing/selftests/acct/acct_syscall.c | 2 +-
+ .../selftests/filesystems/statmount/.gitignore | 1 +
+ tools/testing/selftests/ipc/msgque.c | 2 +-
+ tools/testing/selftests/kselftest.h | 28 +++++-
+ tools/testing/selftests/kselftest/ksft.py | 3 +
+ tools/testing/selftests/kselftest/ktap_helpers.sh | 4 +
+ .../selftests/media_tests/regression_test.txt | 8 +-
+ tools/testing/selftests/ring-buffer/map_test.c | 8 +-
+ tools/testing/selftests/run_kselftest.sh | 2 +-
+ .../testing/selftests/timers/clocksource-switch.c | 6 +-
+ tools/testing/selftests/vDSO/parse_vdso.c | 106 ++++++++++++++++-----
+ tools/testing/selftests/zram/.gitignore | 2 +
+ 12 files changed, 133 insertions(+), 39 deletions(-)
+ create mode 100644 tools/testing/selftests/zram/.gitignore
+Merging kunit/test (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test
+Already up to date.
+Merging kunit-next/kunit (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit
+Already up to date.
+Merging livepatching/for-next (7e17e80c3a7e Merge branch 'for-6.14/stack-order' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-kernel-livepatch | 9 +++
+ kernel/livepatch/core.c | 24 ++++++++
+ .../testing/selftests/livepatch/test-callbacks.sh | 2 +-
+ tools/testing/selftests/livepatch/test-sysfs.sh | 71 ++++++++++++++++++++++
+ 4 files changed, 105 insertions(+), 1 deletion(-)
+Merging rtc/rtc-next (e0779a0dcf41 rtc: ab-eoz9: don't fail temperature reads on undervoltage notification)
+$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next
+Already up to date.
+Merging nvdimm/libnvdimm-for-next (f3dd9ae7f03a dax: Remove an unused field in struct dax_operations)
+$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next
+Already up to date.
+Merging at24/at24/for-next (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next
+Already up to date.
+Merging ntb/ntb-next (c620f56c70eb MAINTAINERS: Update AMD NTB maintainers)
+$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 -
+ drivers/ntb/hw/intel/ntb_hw_gen3.c | 3 +++
+ drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+Merging seccomp/for-next/seccomp (8cf8dfceebda seccomp: Stub for !HAVE_ARCH_SECCOMP_FILTER)
+$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp
+Already up to date.
+Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next
+Merge made by the 'ort' strategy.
+ drivers/fsi/fsi-sbefifo.c | 9 ++++++++-
+ drivers/fsi/i2cr-scom.c | 11 ++++++++++-
+ 2 files changed, 18 insertions(+), 2 deletions(-)
+Merging slimbus/for-next (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next
+Already up to date.
+Merging nvmem/for-next (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next
+Already up to date.
+Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends)
+$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main
+Auto-merging lib/xarray.c
+Merge made by the 'ort' strategy.
+ include/linux/xarray.h | 60 +++++++++++++++++++++++++++-----------------------
+ lib/xarray.c | 3 +--
+ 2 files changed, 34 insertions(+), 29 deletions(-)
+Merging hyperv/hyperv-next (26e1b813fcd0 iommu/hyper-v: Don't assume cpu_possible_mask is dense)
+$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next
+Auto-merging MAINTAINERS
+Auto-merging arch/x86/hyperv/ivm.c
+Auto-merging arch/x86/include/asm/kvm_host.h
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 8 +-
+ arch/arm64/hyperv/hv_core.c | 3 +-
+ arch/arm64/hyperv/mshyperv.c | 4 +-
+ arch/arm64/include/asm/hyperv-tlfs.h | 71 --
+ arch/arm64/include/asm/mshyperv.h | 7 +-
+ arch/x86/hyperv/hv_apic.c | 1 -
+ arch/x86/hyperv/hv_init.c | 23 +-
+ arch/x86/hyperv/hv_proc.c | 3 +-
+ arch/x86/hyperv/ivm.c | 1 -
+ arch/x86/hyperv/mmu.c | 1 -
+ arch/x86/hyperv/nested.c | 2 +-
+ arch/x86/include/asm/hyperv-tlfs.h | 811 ---------------------
+ arch/x86/include/asm/kvm_host.h | 3 +-
+ arch/x86/include/asm/mshyperv.h | 3 +-
+ arch/x86/include/asm/svm.h | 2 +-
+ arch/x86/kernel/cpu/mshyperv.c | 2 +-
+ arch/x86/kvm/vmx/hyperv_evmcs.h | 2 +-
+ arch/x86/kvm/vmx/vmx_onhyperv.h | 2 +-
+ arch/x86/mm/pat/set_memory.c | 2 -
+ drivers/clocksource/hyperv_timer.c | 2 +-
+ drivers/hv/hv_balloon.c | 4 +-
+ drivers/hv/hv_common.c | 6 +-
+ drivers/hv/hv_kvp.c | 2 +-
+ drivers/hv/hv_snapshot.c | 2 +-
+ drivers/hv/hyperv_vmbus.h | 2 +-
+ drivers/iommu/hyperv-iommu.c | 4 +-
+ include/asm-generic/hyperv-tlfs.h | 874 -----------------------
+ include/asm-generic/mshyperv.h | 7 +-
+ include/clocksource/hyperv_timer.h | 2 +-
+ include/hyperv/hvgdk.h | 308 ++++++++
+ include/hyperv/hvgdk_ext.h | 46 ++
+ include/hyperv/hvgdk_mini.h | 1306 ++++++++++++++++++++++++++++++++++
+ include/hyperv/hvhdk.h | 733 +++++++++++++++++++
+ include/hyperv/hvhdk_mini.h | 311 ++++++++
+ include/linux/hyperv.h | 11 +-
+ net/vmw_vsock/hyperv_transport.c | 6 +-
+ 36 files changed, 2753 insertions(+), 1824 deletions(-)
+ delete mode 100644 arch/arm64/include/asm/hyperv-tlfs.h
+ delete mode 100644 arch/x86/include/asm/hyperv-tlfs.h
+ delete mode 100644 include/asm-generic/hyperv-tlfs.h
+ create mode 100644 include/hyperv/hvgdk.h
+ create mode 100644 include/hyperv/hvgdk_ext.h
+ create mode 100644 include/hyperv/hvgdk_mini.h
+ create mode 100644 include/hyperv/hvhdk.h
+ create mode 100644 include/hyperv/hvhdk_mini.h
+Merging auxdisplay/for-next (93b216cb312d auxdisplay: img-ascii-lcd: Constify struct img_ascii_lcd_config)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next
+Merge made by the 'ort' strategy.
+ drivers/auxdisplay/img-ascii-lcd.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+Merging kgdb/kgdb/for-next (24b2455fe8fc kdb: fix ctrl+e/a/f/b/d/p/n broken in keyboard mode)
+$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next
+Already up to date.
+Merging hmm/hmm (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm
+Already up to date.
+Merging cfi/cfi/next (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next
+Already up to date.
+Merging mhi/mhi-next (9241459b3cc2 bus: mhi: host: pci_generic: Add support for QDU100 device)
+$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
+Auto-merging drivers/bus/mhi/host/pci_generic.c
+Merge made by the 'ort' strategy.
+ drivers/bus/mhi/host/boot.c | 1 +
+ drivers/bus/mhi/host/pci_generic.c | 55 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 56 insertions(+)
+Merging memblock/for-next (98b7beba1ee6 memblock: uniformly initialize all reserved pages to MIGRATE_MOVABLE)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next
+Already up to date.
+Merging cxl/next (2f84d072bdcb cxl/pci: Add CXL Type 1/2 support to cxl_dvsec_rr_decode())
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next
+Auto-merging drivers/cxl/core/pci.c
+Auto-merging drivers/cxl/cxl.h
+Merge made by the 'ort' strategy.
+ drivers/acpi/numa/hmat.c | 24 ++++++++++++------------
+ drivers/cxl/core/pci.c | 6 +++---
+ drivers/cxl/cxl.h | 3 ++-
+ drivers/cxl/port.c | 2 +-
+ tools/testing/cxl/test/mock.c | 6 +++---
+ 5 files changed, 21 insertions(+), 20 deletions(-)
+Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
+$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next
+Auto-merging include/linux/zstd.h
+Auto-merging lib/zstd/common/mem.h
+Auto-merging lib/zstd/compress/zstd_compress.c
+Auto-merging lib/zstd/zstd_compress_module.c
+Auto-merging lib/zstd/zstd_decompress_module.c
+Merge made by the 'ort' strategy.
+ include/linux/zstd.h | 2 +-
+ include/linux/zstd_errors.h | 23 +-
+ include/linux/zstd_lib.h | 697 ++++++++--
+ lib/zstd/Makefile | 2 +-
+ lib/zstd/common/allocations.h | 56 +
+ lib/zstd/common/bits.h | 149 ++
+ lib/zstd/common/bitstream.h | 53 +-
+ lib/zstd/common/compiler.h | 14 +-
+ lib/zstd/common/cpu.h | 3 +-
+ lib/zstd/common/debug.c | 5 +-
+ lib/zstd/common/debug.h | 3 +-
+ lib/zstd/common/entropy_common.c | 42 +-
+ lib/zstd/common/error_private.c | 12 +-
+ lib/zstd/common/error_private.h | 3 +-
+ lib/zstd/common/fse.h | 89 +-
+ lib/zstd/common/fse_decompress.c | 94 +-
+ lib/zstd/common/huf.h | 234 +---
+ lib/zstd/common/mem.h | 2 +-
+ lib/zstd/common/portability_macros.h | 26 +-
+ lib/zstd/common/zstd_common.c | 38 +-
+ lib/zstd/common/zstd_deps.h | 16 +-
+ lib/zstd/common/zstd_internal.h | 99 +-
+ lib/zstd/compress/clevels.h | 3 +-
+ lib/zstd/compress/fse_compress.c | 59 +-
+ lib/zstd/compress/hist.c | 3 +-
+ lib/zstd/compress/hist.h | 3 +-
+ lib/zstd/compress/huf_compress.c | 372 +++--
+ lib/zstd/compress/zstd_compress.c | 1758 +++++++++++++++++-------
+ lib/zstd/compress/zstd_compress_internal.h | 333 +++--
+ lib/zstd/compress/zstd_compress_literals.c | 155 ++-
+ lib/zstd/compress/zstd_compress_literals.h | 25 +-
+ lib/zstd/compress/zstd_compress_sequences.c | 7 +-
+ lib/zstd/compress/zstd_compress_sequences.h | 3 +-
+ lib/zstd/compress/zstd_compress_superblock.c | 47 +-
+ lib/zstd/compress/zstd_compress_superblock.h | 3 +-
+ lib/zstd/compress/zstd_cwksp.h | 149 +-
+ lib/zstd/compress/zstd_double_fast.c | 129 +-
+ lib/zstd/compress/zstd_double_fast.h | 6 +-
+ lib/zstd/compress/zstd_fast.c | 578 ++++++--
+ lib/zstd/compress/zstd_fast.h | 6 +-
+ lib/zstd/compress/zstd_lazy.c | 518 +++----
+ lib/zstd/compress/zstd_lazy.h | 7 +-
+ lib/zstd/compress/zstd_ldm.c | 11 +-
+ lib/zstd/compress/zstd_ldm.h | 3 +-
+ lib/zstd/compress/zstd_ldm_geartab.h | 3 +-
+ lib/zstd/compress/zstd_opt.c | 187 +--
+ lib/zstd/compress/zstd_opt.h | 3 +-
+ lib/zstd/decompress/huf_decompress.c | 772 +++++++----
+ lib/zstd/decompress/zstd_ddict.c | 9 +-
+ lib/zstd/decompress/zstd_ddict.h | 3 +-
+ lib/zstd/decompress/zstd_decompress.c | 259 +++-
+ lib/zstd/decompress/zstd_decompress_block.c | 283 ++--
+ lib/zstd/decompress/zstd_decompress_block.h | 8 +-
+ lib/zstd/decompress/zstd_decompress_internal.h | 7 +-
+ lib/zstd/decompress_sources.h | 2 +-
+ lib/zstd/zstd_common_module.c | 5 +-
+ lib/zstd/zstd_compress_module.c | 2 +-
+ lib/zstd/zstd_decompress_module.c | 4 +-
+ 58 files changed, 4791 insertions(+), 2596 deletions(-)
+ create mode 100644 lib/zstd/common/allocations.h
+ create mode 100644 lib/zstd/common/bits.h
+Merging efi/next (7f0158f3ee12 efi/libstub: Avoid legacy decompressor zlib/zstd wrappers)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next
+Merge made by the 'ort' strategy.
+ drivers/firmware/efi/libstub/Makefile | 7 +-
+ drivers/firmware/efi/libstub/efistub.h | 7 +-
+ .../firmware/efi/libstub/zboot-decompress-gzip.c | 68 ++++++++++++++++++
+ .../firmware/efi/libstub/zboot-decompress-zstd.c | 83 ++++++++++++++++++++++
+ drivers/firmware/efi/libstub/zboot.c | 65 +++--------------
+ drivers/firmware/efi/libstub/zboot.lds | 1 +
+ 6 files changed, 173 insertions(+), 58 deletions(-)
+ create mode 100644 drivers/firmware/efi/libstub/zboot-decompress-gzip.c
+ create mode 100644 drivers/firmware/efi/libstub/zboot-decompress-zstd.c
+Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next
+Already up to date.
+Merging slab/slab/for-next (c44d336ad5ba mm/slab: Move kvfree_rcu() into SLAB)
+$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next
+Auto-merging include/linux/slab.h
+Auto-merging init/main.c
+Auto-merging kernel/rcu/tree.c
+CONFLICT (content): Merge conflict in kernel/rcu/tree.c
+Resolved 'kernel/rcu/tree.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 877a798a329d] Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
+$ git diff -M --stat --summary HEAD^..
+ include/linux/slab.h | 1 +
+ init/main.c | 1 +
+ kernel/rcu/tree.c | 876 --------------------------------------------------
+ mm/slab_common.c | 880 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 882 insertions(+), 876 deletions(-)
+$ git am -3 ../patches/0001-fix-up-for-mm-slab-Move-kvfree_rcu-into-SLAB.patch
+Applying: fix up for "mm/slab: Move kvfree_rcu() into SLAB"
+$ git reset HEAD^
+Unstaged changes after reset:
+M mm/slab_common.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 85eba21c3672] Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
+ Date: Mon Jan 6 17:14:50 2025 +1100
+Merging random/master (d18c13697b4d prandom: Include <linux/percpu.h> in <linux/prandom.h>)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master
+Already up to date.
+Merging landlock/next (78d4f34e2115 Linux 6.13-rc3)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next
+Already up to date.
+Merging rust/rust-next (0c5928deada1 rust: block: fix formatting in GenDisk doc)
+$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next
+Auto-merging rust/kernel/miscdevice.rs
+CONFLICT (content): Merge conflict in rust/kernel/miscdevice.rs
+Auto-merging rust/kernel/security.rs
+CONFLICT (content): Merge conflict in rust/kernel/security.rs
+Auto-merging rust/kernel/workqueue.rs
+Resolved 'rust/kernel/miscdevice.rs' using previous resolution.
+Resolved 'rust/kernel/security.rs' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 0fd2c5a69b09] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/drm_panic_qr.rs | 2 +-
+ rust/ffi.rs | 37 ++++++++++++++++++++++++++++++++++++-
+ rust/kernel/alloc/kbox.rs | 12 +++++++++++-
+ rust/kernel/block/mq/gen_disk.rs | 6 +++---
+ rust/kernel/device.rs | 4 ++--
+ rust/kernel/error.rs | 16 +++++-----------
+ rust/kernel/firmware.rs | 2 +-
+ rust/kernel/miscdevice.rs | 12 ++++--------
+ rust/kernel/print.rs | 4 ++--
+ rust/kernel/seq_file.rs | 2 +-
+ rust/kernel/str.rs | 6 +++---
+ rust/kernel/sync/arc.rs | 8 ++++++++
+ rust/kernel/uaccess.rs | 27 +++++++--------------------
+ rust/kernel/workqueue.rs | 3 +++
+ samples/rust/rust_print_main.rs | 2 +-
+ 15 files changed, 88 insertions(+), 55 deletions(-)
+Merging sysctl/sysctl-next (9c738dae9534 sysctl: Reduce dput(child) calls in proc_sys_fill_cache())
+$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next
+Already up to date.
+Merging execve/for-next/execve (c7c1167fcbbd Merge branch 'for-next/topic/execve/core' into for-next/execve)
+$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve
+Auto-merging MAINTAINERS
+Auto-merging fs/exec.c
+Auto-merging include/linux/sched.h
+Auto-merging io_uring/sqpoll.c
+Auto-merging kernel/kthread.c
+Auto-merging samples/Kconfig
+Auto-merging samples/Makefile
+Auto-merging security/security.c
+Auto-merging tools/testing/selftests/kselftest/ktap_helpers.sh
+Merge made by the 'ort' strategy.
+ Documentation/userspace-api/check_exec.rst | 144 +++++++
+ Documentation/userspace-api/index.rst | 1 +
+ MAINTAINERS | 3 +-
+ fs/binfmt_misc.c | 2 +-
+ fs/exec.c | 83 ++--
+ include/linux/binfmts.h | 9 +-
+ include/linux/coredump.h | 4 +-
+ include/linux/sched.h | 9 +-
+ include/uapi/linux/audit.h | 1 +
+ include/uapi/linux/fcntl.h | 4 +
+ include/uapi/linux/securebits.h | 24 +-
+ io_uring/io-wq.c | 2 +-
+ io_uring/sqpoll.c | 2 +-
+ kernel/kthread.c | 3 +-
+ samples/Kconfig | 9 +
+ samples/Makefile | 1 +
+ samples/check-exec/.gitignore | 2 +
+ samples/check-exec/Makefile | 15 +
+ samples/check-exec/inc.c | 205 ++++++++++
+ samples/check-exec/run-script-ask.inc | 9 +
+ samples/check-exec/script-ask.inc | 5 +
+ samples/check-exec/script-exec.inc | 4 +
+ samples/check-exec/script-noexec.inc | 4 +
+ samples/check-exec/set-exec.c | 85 ++++
+ security/commoncap.c | 29 +-
+ security/integrity/ima/ima_appraise.c | 27 +-
+ security/integrity/ima/ima_main.c | 29 ++
+ security/security.c | 10 +
+ tools/testing/selftests/exec/.gitignore | 4 +
+ tools/testing/selftests/exec/Makefile | 19 +-
+ tools/testing/selftests/exec/check-exec-tests.sh | 205 ++++++++++
+ tools/testing/selftests/exec/check-exec.c | 456 ++++++++++++++++++++++
+ tools/testing/selftests/exec/config | 2 +
+ tools/testing/selftests/exec/execveat.c | 75 +++-
+ tools/testing/selftests/exec/false.c | 5 +
+ tools/testing/selftests/kselftest/ktap_helpers.sh | 2 +-
+ tools/testing/selftests/landlock/fs_test.c | 27 ++
+ 37 files changed, 1464 insertions(+), 56 deletions(-)
+ create mode 100644 Documentation/userspace-api/check_exec.rst
+ create mode 100644 samples/check-exec/.gitignore
+ create mode 100644 samples/check-exec/Makefile
+ create mode 100644 samples/check-exec/inc.c
+ create mode 100755 samples/check-exec/run-script-ask.inc
+ create mode 100755 samples/check-exec/script-ask.inc
+ create mode 100755 samples/check-exec/script-exec.inc
+ create mode 100644 samples/check-exec/script-noexec.inc
+ create mode 100644 samples/check-exec/set-exec.c
+ create mode 100755 tools/testing/selftests/exec/check-exec-tests.sh
+ create mode 100644 tools/testing/selftests/exec/check-exec.c
+ create mode 100644 tools/testing/selftests/exec/config
+ create mode 100644 tools/testing/selftests/exec/false.c
+Merging bitmap/bitmap-for-next (7f15d4abf925 cpu: Remove unused init_cpu_online)
+$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next
+Auto-merging include/linux/compiler.h
+Auto-merging kernel/cpu.c
+Merge made by the 'ort' strategy.
+ arch/riscv/include/asm/bitops.h | 20 ++++++++++----------
+ include/linux/bits.h | 5 ++---
+ include/linux/compiler.h | 22 ++++++++++++++++++++++
+ include/linux/cpumask.h | 1 -
+ kernel/cpu.c | 5 -----
+ 5 files changed, 34 insertions(+), 19 deletions(-)
+Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next
+Already up to date.
+Merging kspp/for-next/kspp (d9a67659846f Merge branch 'for-linus/hardening' into for-next/kspp)
+$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp
+Merge made by the 'ort' strategy.
+ include/trace/events/task.h | 44 +++++++++++++++++++++++++++++++++++++++-----
+ kernel/stackleak.c | 3 ++-
+ kernel/sys.c | 3 +++
+ 3 files changed, 44 insertions(+), 6 deletions(-)
+Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1)
+$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp
+Already up to date.
+Merging nolibc/nolibc (40384c840ea1 Linux 6.13-rc1)
+$ git merge -m Merge branch 'nolibc' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git nolibc/nolibc
+Already up to date.
+Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
+$ git merge -m Merge branch 'tsm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux tsm/tsm-next
+Already up to date.
+Merging iommufd/for-next (11534b4de2a1 iommufd: Deal with IOMMU_HWPT_FAULT_ID_VALID in iommufd core)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next
+Auto-merging drivers/iommu/intel/iommu.c
+Merge made by the 'ort' strategy.
+ .../iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 8 +---
+ drivers/iommu/intel/iommu.c | 3 +-
+ drivers/iommu/iommufd/hw_pagetable.c | 10 +++--
+ drivers/iommu/iommufd/selftest.c | 45 ++++++++--------------
+ 4 files changed, 26 insertions(+), 40 deletions(-)
+Merging turbostat/next (75de0ab82fb4 tools/power turbostat: Add an NMI column)
+$ git merge -m Merge branch 'next' of git://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 | 28 +++++++-
+ tools/power/x86/turbostat/turbostat.c | 128 +++++++++++++++++++++++++++-------
+ 2 files changed, 129 insertions(+), 27 deletions(-)
+Merging pwrseq/pwrseq/for-next (93e3c990fcd9 power: sequencing: qcom-wcn: add support for the WCN6750 PMU)
+$ git merge -m Merge branch 'pwrseq/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next
+Merge made by the 'ort' strategy.
+ drivers/power/sequencing/pwrseq-qcom-wcn.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+Merging capabilities-next/caps-next (d48da4d5ed7b security: add trace event for cap_capable)
+$ git merge -m Merge branch 'caps-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next
+Auto-merging MAINTAINERS
+Auto-merging security/commoncap.c
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 1 +
+ include/trace/events/capability.h | 57 ++++++++++++++++++++++++++++++++++++
+ security/commoncap.c | 61 ++++++++++++++++++++++++++-------------
+ 3 files changed, 99 insertions(+), 20 deletions(-)
+ create mode 100644 include/trace/events/capability.h
+Merging ipe/next (d881f0eb6f23 scripts: ipe: polgen: remove redundant close and error exit path)
+$ 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.
+Merging kcsan/next (b86f7c9fad06 kcsan: Remove redundant call of kallsyms_lookup_name())
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next
+Already up to date.
+Merging crc/crc-next (72914faebaab MAINTAINERS: add entry for CRC library)
+$ git merge -m Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/loongarch/Kconfig
+Auto-merging arch/loongarch/configs/loongson3_defconfig
+Auto-merging arch/m68k/configs/amiga_defconfig
+Auto-merging arch/m68k/configs/apollo_defconfig
+Auto-merging arch/m68k/configs/atari_defconfig
+Auto-merging arch/m68k/configs/bvme6000_defconfig
+Auto-merging arch/m68k/configs/hp300_defconfig
+Auto-merging arch/m68k/configs/mac_defconfig
+Auto-merging arch/m68k/configs/multi_defconfig
+Auto-merging arch/m68k/configs/mvme147_defconfig
+Auto-merging arch/m68k/configs/mvme16x_defconfig
+Auto-merging arch/m68k/configs/q40_defconfig
+Auto-merging arch/m68k/configs/sun3_defconfig
+Auto-merging arch/m68k/configs/sun3x_defconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/powerpc/configs/ppc64_defconfig
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/s390/configs/debug_defconfig
+Auto-merging arch/s390/configs/defconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging crypto/Kconfig
+Auto-merging crypto/Makefile
+Auto-merging drivers/target/iscsi/iscsi_target.c
+Auto-merging fs/bcachefs/Kconfig
+Auto-merging fs/ext4/super.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Makefile
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 11 +
+ arch/arm/Kconfig | 2 +
+ arch/arm/configs/milbeaut_m10v_defconfig | 1 -
+ arch/arm/configs/multi_v7_defconfig | 1 -
+ arch/arm/crypto/Kconfig | 25 -
+ arch/arm/crypto/Makefile | 4 -
+ arch/arm/crypto/crc32-ce-glue.c | 247 ------
+ arch/arm/crypto/crct10dif-ce-glue.c | 124 ---
+ arch/arm/lib/Makefile | 6 +
+ .../crct10dif-ce-core.S => lib/crc-t10dif-core.S} | 0
+ arch/arm/lib/crc-t10dif-glue.c | 80 ++
+ .../{crypto/crc32-ce-core.S => lib/crc32-core.S} | 5 +-
+ arch/arm/lib/crc32-glue.c | 123 +++
+ arch/arm64/Kconfig | 2 +
+ arch/arm64/configs/defconfig | 1 -
+ arch/arm64/crypto/Kconfig | 10 -
+ arch/arm64/crypto/Makefile | 3 -
+ arch/arm64/crypto/crct10dif-ce-glue.c | 132 ----
+ arch/arm64/lib/Makefile | 6 +-
+ .../crct10dif-ce-core.S => lib/crc-t10dif-core.S} | 0
+ arch/arm64/lib/crc-t10dif-glue.c | 81 ++
+ arch/arm64/lib/crc32-glue.c | 25 +-
+ arch/loongarch/Kconfig | 1 +
+ arch/loongarch/configs/loongson3_defconfig | 1 -
+ arch/loongarch/crypto/Kconfig | 9 -
+ arch/loongarch/crypto/Makefile | 2 -
+ arch/loongarch/crypto/crc32-loongarch.c | 300 --------
+ arch/loongarch/lib/Makefile | 2 +
+ arch/loongarch/lib/crc32-loongarch.c | 135 ++++
+ arch/m68k/configs/amiga_defconfig | 1 -
+ arch/m68k/configs/apollo_defconfig | 1 -
+ arch/m68k/configs/atari_defconfig | 1 -
+ arch/m68k/configs/bvme6000_defconfig | 1 -
+ arch/m68k/configs/hp300_defconfig | 1 -
+ arch/m68k/configs/mac_defconfig | 1 -
+ arch/m68k/configs/multi_defconfig | 1 -
+ arch/m68k/configs/mvme147_defconfig | 1 -
+ arch/m68k/configs/mvme16x_defconfig | 1 -
+ arch/m68k/configs/q40_defconfig | 1 -
+ arch/m68k/configs/sun3_defconfig | 1 -
+ arch/m68k/configs/sun3x_defconfig | 1 -
+ arch/mips/Kconfig | 5 +-
+ arch/mips/configs/eyeq5_defconfig | 1 -
+ arch/mips/configs/eyeq6_defconfig | 1 -
+ arch/mips/configs/generic/32r6.config | 2 -
+ arch/mips/configs/generic/64r6.config | 1 -
+ arch/mips/crypto/Kconfig | 9 -
+ arch/mips/crypto/Makefile | 2 -
+ arch/mips/crypto/crc32-mips.c | 354 ---------
+ arch/mips/lib/Makefile | 2 +
+ arch/mips/lib/crc32-mips.c | 192 +++++
+ arch/powerpc/Kconfig | 2 +
+ arch/powerpc/configs/powernv_defconfig | 2 -
+ arch/powerpc/configs/ppc64_defconfig | 3 -
+ arch/powerpc/crypto/Kconfig | 33 -
+ arch/powerpc/crypto/Makefile | 5 -
+ arch/powerpc/crypto/crc-vpmsum_test.c | 133 ----
+ arch/powerpc/crypto/crc32c-vpmsum_glue.c | 173 -----
+ arch/powerpc/lib/Makefile | 6 +
+ .../crc-t10dif-glue.c} | 69 +-
+ arch/powerpc/lib/crc32-glue.c | 92 +++
+ arch/powerpc/{crypto => lib}/crc32-vpmsum_core.S | 0
+ arch/powerpc/{crypto => lib}/crc32c-vpmsum_asm.S | 0
+ .../powerpc/{crypto => lib}/crct10dif-vpmsum_asm.S | 0
+ arch/riscv/Kconfig | 1 +
+ arch/riscv/lib/Makefile | 3 +-
+ arch/riscv/lib/{crc32.c => crc32-riscv.c} | 25 +-
+ arch/s390/Kconfig | 1 +
+ arch/s390/configs/debug_defconfig | 2 -
+ arch/s390/configs/defconfig | 1 -
+ arch/s390/crypto/Kconfig | 12 -
+ arch/s390/crypto/Makefile | 2 -
+ arch/s390/crypto/crc32-vx.c | 306 --------
+ arch/s390/lib/Makefile | 3 +
+ arch/s390/lib/crc32-glue.c | 92 +++
+ arch/s390/{crypto => lib}/crc32-vx.h | 0
+ arch/s390/{crypto => lib}/crc32be-vx.c | 0
+ arch/s390/{crypto => lib}/crc32le-vx.c | 0
+ arch/sparc/Kconfig | 1 +
+ arch/sparc/crypto/Kconfig | 10 -
+ arch/sparc/crypto/Makefile | 4 -
+ arch/sparc/crypto/crc32c_glue.c | 184 -----
+ arch/sparc/lib/Makefile | 2 +
+ arch/sparc/lib/crc32_glue.c | 93 +++
+ arch/sparc/{crypto => lib}/crc32c_asm.S | 2 +-
+ arch/x86/Kconfig | 2 +
+ arch/x86/crypto/Kconfig | 32 -
+ arch/x86/crypto/Makefile | 10 -
+ arch/x86/crypto/crc32-pclmul_glue.c | 202 -----
+ arch/x86/crypto/crc32c-intel_glue.c | 250 ------
+ arch/x86/crypto/crct10dif-pclmul_glue.c | 143 ----
+ arch/x86/lib/Makefile | 7 +
+ arch/x86/lib/crc-t10dif-glue.c | 51 ++
+ arch/x86/lib/crc32-glue.c | 124 +++
+ .../crc32-pclmul_asm.S => lib/crc32-pclmul.S} | 19 +-
+ .../crc32c-3way.S} | 63 +-
+ arch/x86/{crypto => lib}/crct10dif-pcl-asm_64.S | 0
+ crypto/Kconfig | 1 +
+ crypto/Makefile | 3 +-
+ crypto/crc32_generic.c | 8 +-
+ crypto/crc32c_generic.c | 12 +-
+ crypto/crct10dif_common.c | 82 --
+ crypto/crct10dif_generic.c | 82 +-
+ drivers/target/iscsi/Kconfig | 4 +-
+ drivers/target/iscsi/iscsi_target.c | 153 ++--
+ drivers/target/iscsi/iscsi_target_login.c | 50 --
+ drivers/target/iscsi/iscsi_target_login.h | 1 -
+ drivers/target/iscsi/iscsi_target_nego.c | 21 +-
+ fs/bcachefs/Kconfig | 1 +
+ fs/ext4/Kconfig | 3 +-
+ fs/ext4/ext4.h | 25 +-
+ fs/ext4/super.c | 15 -
+ fs/f2fs/Kconfig | 3 +-
+ fs/f2fs/f2fs.h | 20 +-
+ fs/f2fs/super.c | 15 -
+ fs/jbd2/Kconfig | 2 -
+ fs/jbd2/journal.c | 30 +-
+ include/linux/crc-t10dif.h | 28 +-
+ include/linux/crc32.h | 50 +-
+ include/linux/crc32c.h | 7 +-
+ include/linux/jbd2.h | 33 +-
+ include/target/iscsi/iscsi_target_core.h | 3 -
+ lib/Kconfig | 121 ++-
+ lib/Kconfig.debug | 29 +-
+ lib/Makefile | 4 +-
+ lib/crc-t10dif.c | 156 ++--
+ lib/crc16_kunit.c | 155 ----
+ lib/crc32.c | 24 +-
+ lib/crc32test.c | 852 ---------------------
+ lib/crc_kunit.c | 435 +++++++++++
+ lib/libcrc32c.c | 74 --
+ tools/testing/selftests/arm64/fp/kernel-test.c | 3 +-
+ 132 files changed, 2035 insertions(+), 4555 deletions(-)
+ delete mode 100644 arch/arm/crypto/crc32-ce-glue.c
+ delete mode 100644 arch/arm/crypto/crct10dif-ce-glue.c
+ rename arch/arm/{crypto/crct10dif-ce-core.S => lib/crc-t10dif-core.S} (100%)
+ create mode 100644 arch/arm/lib/crc-t10dif-glue.c
+ rename arch/arm/{crypto/crc32-ce-core.S => lib/crc32-core.S} (98%)
+ create mode 100644 arch/arm/lib/crc32-glue.c
+ delete mode 100644 arch/arm64/crypto/crct10dif-ce-glue.c
+ rename arch/arm64/{crypto/crct10dif-ce-core.S => lib/crc-t10dif-core.S} (100%)
+ create mode 100644 arch/arm64/lib/crc-t10dif-glue.c
+ delete mode 100644 arch/loongarch/crypto/crc32-loongarch.c
+ create mode 100644 arch/loongarch/lib/crc32-loongarch.c
+ delete mode 100644 arch/mips/crypto/crc32-mips.c
+ create mode 100644 arch/mips/lib/crc32-mips.c
+ delete mode 100644 arch/powerpc/crypto/crc-vpmsum_test.c
+ delete mode 100644 arch/powerpc/crypto/crc32c-vpmsum_glue.c
+ rename arch/powerpc/{crypto/crct10dif-vpmsum_glue.c => lib/crc-t10dif-glue.c} (50%)
+ create mode 100644 arch/powerpc/lib/crc32-glue.c
+ rename arch/powerpc/{crypto => lib}/crc32-vpmsum_core.S (100%)
+ rename arch/powerpc/{crypto => lib}/crc32c-vpmsum_asm.S (100%)
+ rename arch/powerpc/{crypto => lib}/crct10dif-vpmsum_asm.S (100%)
+ rename arch/riscv/lib/{crc32.c => crc32-riscv.c} (91%)
+ delete mode 100644 arch/s390/crypto/crc32-vx.c
+ create mode 100644 arch/s390/lib/crc32-glue.c
+ rename arch/s390/{crypto => lib}/crc32-vx.h (100%)
+ rename arch/s390/{crypto => lib}/crc32be-vx.c (100%)
+ rename arch/s390/{crypto => lib}/crc32le-vx.c (100%)
+ delete mode 100644 arch/sparc/crypto/crc32c_glue.c
+ create mode 100644 arch/sparc/lib/crc32_glue.c
+ rename arch/sparc/{crypto => lib}/crc32c_asm.S (92%)
+ delete mode 100644 arch/x86/crypto/crc32-pclmul_glue.c
+ delete mode 100644 arch/x86/crypto/crc32c-intel_glue.c
+ delete mode 100644 arch/x86/crypto/crct10dif-pclmul_glue.c
+ create mode 100644 arch/x86/lib/crc-t10dif-glue.c
+ create mode 100644 arch/x86/lib/crc32-glue.c
+ rename arch/x86/{crypto/crc32-pclmul_asm.S => lib/crc32-pclmul.S} (95%)
+ rename arch/x86/{crypto/crc32c-pcl-intel-asm_64.S => lib/crc32c-3way.S} (92%)
+ rename arch/x86/{crypto => lib}/crct10dif-pcl-asm_64.S (100%)
+ delete mode 100644 crypto/crct10dif_common.c
+ delete mode 100644 lib/crc16_kunit.c
+ delete mode 100644 lib/crc32test.c
+ create mode 100644 lib/crc_kunit.c
+ delete mode 100644 lib/libcrc32c.c
+Merging kthread/for-next (8c33e5711a2d rcu: Use kthread preferred affinity for RCU exp kworkers)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git kthread/for-next
+Auto-merging arch/arm64/include/asm/cpufeature.h
+Auto-merging arch/arm64/kernel/cpufeature.c
+Auto-merging drivers/gpu/drm/msm/msm_kms.c
+Auto-merging drivers/net/dsa/mv88e6xxx/chip.c
+Auto-merging drivers/platform/chrome/cros_ec_spi.c
+Auto-merging drivers/spi/spi.c
+Auto-merging drivers/usb/typec/tcpm/tcpm.c
+Auto-merging fs/erofs/zdata.c
+Auto-merging kernel/kthread.c
+Auto-merging kernel/rcu/tree.c
+Auto-merging kernel/rcu/tree_plugin.h
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/sched/ext.c
+Auto-merging kernel/workqueue.c
+Auto-merging mm/compaction.c
+Auto-merging mm/vmscan.c
+Auto-merging net/dsa/tag_ocelot_8021q.c
+Merge made by the 'ort' strategy.
+ Documentation/arch/arm64/asymmetric-32bit.rst | 9 +
+ arch/arm/common/bL_switcher.c | 10 +-
+ arch/arm64/include/asm/cpufeature.h | 1 +
+ arch/arm64/include/asm/mmu_context.h | 2 +
+ arch/arm64/kernel/cpufeature.c | 17 +-
+ arch/x86/kvm/i8254.c | 2 +-
+ crypto/crypto_engine.c | 2 +-
+ drivers/cpufreq/cppc_cpufreq.c | 2 +-
+ drivers/gpu/drm/drm_vblank_work.c | 2 +-
+ .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_execlists.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +-
+ drivers/gpu/drm/i915/gt/selftest_slpc.c | 2 +-
+ drivers/gpu/drm/i915/selftests/i915_request.c | 8 +-
+ drivers/gpu/drm/msm/disp/msm_disp_snapshot.c | 2 +-
+ drivers/gpu/drm/msm/msm_atomic.c | 2 +-
+ drivers/gpu/drm/msm/msm_gpu.c | 2 +-
+ drivers/gpu/drm/msm/msm_kms.c | 2 +-
+ .../media/platform/chips-media/wave5/wave5-vpu.c | 2 +-
+ drivers/net/dsa/mv88e6xxx/chip.c | 2 +-
+ drivers/net/ethernet/intel/ice/ice_dpll.c | 2 +-
+ drivers/net/ethernet/intel/ice/ice_gnss.c | 2 +-
+ drivers/net/ethernet/intel/ice/ice_ptp.c | 2 +-
+ drivers/platform/chrome/cros_ec_spi.c | 2 +-
+ drivers/ptp/ptp_clock.c | 2 +-
+ drivers/soc/fsl/qbman/qman_test_stash.c | 6 +-
+ drivers/spi/spi.c | 2 +-
+ drivers/usb/typec/tcpm/tcpm.c | 2 +-
+ drivers/vdpa/vdpa_sim/vdpa_sim.c | 2 +-
+ drivers/watchdog/watchdog_dev.c | 2 +-
+ fs/erofs/zdata.c | 2 +-
+ include/linux/cpuhotplug.h | 1 +
+ include/linux/kthread.h | 56 +++++-
+ include/linux/mmu_context.h | 1 +
+ kernel/kallsyms_selftest.c | 4 +-
+ kernel/kthread.c | 201 ++++++++++++++++++---
+ kernel/rcu/tree.c | 94 ++--------
+ kernel/rcu/tree_plugin.h | 11 +-
+ kernel/sched/core.c | 2 +-
+ kernel/sched/ext.c | 2 +-
+ kernel/workqueue.c | 2 +-
+ lib/test_objpool.c | 19 +-
+ mm/compaction.c | 43 +----
+ mm/vmscan.c | 8 +-
+ net/dsa/tag_ksz.c | 2 +-
+ net/dsa/tag_ocelot_8021q.c | 2 +-
+ net/dsa/tag_sja1105.c | 2 +-
+ 47 files changed, 334 insertions(+), 217 deletions(-)
+Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT)
+$ git merge -m Merge branch 'header_cleanup' of git://evilpiepirate.org/bcachefs.git header_cleanup/header_cleanup
+Already up to date.
gentwo / linux / .git / commitdiff