
Steps on the way to 5.10-rc1 Resolves conflicts in: drivers/hwtracing/stm/ftrace.c drivers/misc/Makefile Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I8ac53000bf0c61973970f47b383904a2067bd353
Steps on the way to 5.10-rc1 Resolves conflicts in: drivers/hwtracing/stm/ftrace.c drivers/misc/Makefile Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I8ac53000bf0c61973970f47b383904a2067bd353