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

diff --cc arch/arm64/include/asm/cpufeature.h
Simple merge

diff --cc arch/arm64/kernel/cpufeature.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_kms.c
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/platform/chrome/cros_ec_spi.c
Simple merge

diff --cc drivers/spi/spi.c
Simple merge

diff --cc drivers/usb/typec/tcpm/tcpm.c
Simple merge

diff --cc fs/erofs/zdata.c
Simple merge

diff --cc kernel/kthread.c
Simple merge

diff --cc kernel/rcu/tree.c
Simple merge

diff --cc kernel/rcu/tree_plugin.h
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/ext.c
Simple merge

diff --cc kernel/workqueue.c
Simple merge

diff --cc mm/compaction.c
Simple merge

diff --cc mm/vmscan.c
Simple merge

diff --cc net/dsa/tag_ocelot_8021q.c
Simple merge