Hi Steven, two patches for ftrace direct multi sample: - fix ftrace direct multi sample config option handling, required because of an incorrect merge resolution proposed by me. - add s390 support for ftrace direct multi sample If you are happy with them, I could carry with the s390 tree and target for rc2, or you could pick them up. Whatever you prefer. Thanks, Heiko Heiko Carstens (2): ftrace/samples: add missing Kconfig option for ftrace direct multi sample ftrace/samples: add s390 support for ftrace direct multi sample arch/s390/Kconfig | 1 + arch/x86/Kconfig | 2 +- samples/Kconfig | 11 +++++++++- samples/Makefile | 2 +- samples/ftrace/Makefile | 2 +- samples/ftrace/ftrace-direct-multi.c | 30 ++++++++++++++++++++++++++++ 6 files changed, 44 insertions(+), 4 deletions(-) -- 2.25.1
