]> www.infradead.org Git - users/hch/misc.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 May 2025 06:55:10 +0000 (16:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 May 2025 06:55:10 +0000 (16:55 +1000)
commit9338c022c915682ddd3a4a173edadfeb7266460e
tree1fa8f07207be9f6de30e1950abe5bd4b339661d5
parentfa731ae981d77ca9120d6720f1af8f96ff30a764
parentb671c27ccae55303f42c9f32de65cd07c0ba028f
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git

# Conflicts:
# Documentation/admin-guide/hw-vuln/index.rst
# arch/loongarch/kernel/entry.S
# arch/x86/Kconfig.assembler
# arch/x86/include/asm/cpufeatures.h
# arch/x86/kernel/alternative.c
# arch/x86/kernel/cpu/bugs.c
# arch/x86/kernel/cpu/common.c
# drivers/base/cpu.c
# drivers/cpufreq/amd-pstate.c
# drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c
# include/linux/cpu.h
85 files changed:
Documentation/ABI/testing/sysfs-devices-system-cpu
Documentation/admin-guide/hw-vuln/index.rst
Documentation/admin-guide/kernel-parameters.txt
MAINTAINERS
arch/arm/common/sa1111.c
arch/arm/plat-orion/gpio.c
arch/loongarch/kernel/entry.S
arch/powerpc/platforms/52xx/mpc52xx_gpt.c
arch/powerpc/platforms/pseries/msi.c
arch/powerpc/sysdev/mpic.c
arch/riscv/kernel/entry.S
arch/x86/Kconfig
arch/x86/Kconfig.assembler
arch/x86/include/asm/alternative.h
arch/x86/include/asm/cpufeatures.h
arch/x86/include/asm/msr-index.h
arch/x86/include/asm/nospec-branch.h
arch/x86/include/asm/pgtable.h
arch/x86/include/asm/setup.h
arch/x86/kernel/alternative.c
arch/x86/kernel/cpu/bugs.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/ftrace.c
arch/x86/kernel/machine_kexec_64.c
arch/x86/kernel/module.c
arch/x86/kernel/setup.c
arch/x86/kernel/static_call.c
arch/x86/kernel/vmlinux.lds.S
arch/x86/kvm/svm/sev.c
arch/x86/kvm/x86.c
arch/x86/lib/retpoline.S
arch/x86/mm/init_32.c
arch/x86/mm/init_64.c
arch/x86/mm/pat/set_memory.c
arch/x86/mm/pgtable.c
arch/x86/net/bpf_jit_comp.c
arch/x86/realmode/init.c
drivers/base/cpu.c
drivers/base/power/main.c
drivers/char/random.c
drivers/cpufreq/amd-pstate-ut.c
drivers/cpufreq/amd-pstate.c
drivers/cpufreq/intel_pstate.c
drivers/crypto/ccp/sev-dev.c
drivers/firmware/efi/libstub/Makefile
drivers/gpu/drm/msm/msm_mdss.c
drivers/gpu/drm/ttm/tests/ttm_bo_test.c
drivers/hwmon/k10temp.c
drivers/i2c/busses/Kconfig
drivers/i2c/busses/i2c-piix4.c
drivers/idle/intel_idle.c
drivers/memory/omap-gpmc.c
drivers/net/dsa/microchip/ksz_common.c
drivers/net/dsa/microchip/ksz_ptp.c
drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c
drivers/net/usb/lan78xx.c
drivers/pci/controller/dwc/pcie-dw-rockchip.c
drivers/pci/controller/pci-mvebu.c
drivers/pci/pci.h
drivers/platform/x86/amd/hsmp/acpi.c
drivers/platform/x86/amd/hsmp/plat.c
drivers/platform/x86/amd/pmc/pmc-quirks.c
drivers/soc/fsl/qe/qe_ic.c
drivers/soc/qcom/smp2p.c
drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
include/linux/cpu.h
include/linux/mm_types.h
include/linux/mmap_lock.h
include/linux/sched.h
include/linux/vmalloc.h
init/Kconfig
init/main.c
kernel/fork.c
kernel/sched/core.c
kernel/sched/debug.c
kernel/sched/fair.c
kernel/sched/sched.h
kernel/sched/topology.c
mm/nommu.c
mm/vmalloc.c
net/bridge/br_multicast.c
sound/soc/sof/amd/acp.c
tools/objtool/arch/x86/decode.c
tools/perf/util/amd-sample-raw.c
tools/testing/selftests/bpf/bench.c