Merge branch 'nolibc' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git

Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git

Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git

Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git

Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git

# Conflicts:
# rust/kernel/lib.rs
# rust/kernel/miscdevice.rs
# rust/kernel/security.rs

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git

Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git

Merge branch 'zstd-next' of https://github.com/terrelln/linux.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git

Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git

Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git

Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git

Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching

Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git

# Conflicts:
# tools/testing/selftests/kselftest/ktap_helpers.sh

Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git

Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git

# Conflicts:
# drivers/ata/ahci.h
# drivers/ata/sata_mv.c
# include/linux/libata.h

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git

Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git

Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

Merge branch 'next' of git://github.com/awilliam/linux-vfio.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git

Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git

# Conflicts:
# Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git

Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git

# Conflicts:
# arch/arm64/boot/dts/qcom/x1e80100-qcp.dts

Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git

Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git

Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git

Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git

Merge branch 'next' of https://github.com/kvm-x86/linux.git

# Conflicts:
# arch/x86/kvm/cpuid.c

Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git

Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git

Merge branch 'misc' into for-next

Merge branch 'non-rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git

# Conflicts:
# kernel/rcu/tree.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git

Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git

# Conflicts:
# drivers/edac/i10nm_base.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git

# Conflicts:
# include/linux/seqlock.h

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git

Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git

Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git

Merge branch 'next' of git://github.com/cschaufler/smack-next

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git

Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity

Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git

Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git

# Conflicts:
# drivers/mfd/cs42l43.c

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git

Merge branch 'for-next' of git://git.kernel.dk/linux-block.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git

Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git

Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel

Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux

Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git

Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git

Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git

# Conflicts:
# drivers/gpu/drm/display/drm_bridge_connector.c
# drivers/gpu/drm/i915/display/intel_display_driver.c
# drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git

Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git

Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git

Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git

Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git

Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git

Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git

Merge branch 'docs-next' of git://git.lwn.net/linux.git

# Conflicts:
# scripts/checkpatch.pl

Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git

Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git

Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git