Merge branch 'v5.15/standard/base' into v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
# Conflicts:
# arch/arm/include/asm/thread_info.h
# drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
Please register or sign in to comment