]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'ftrace/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 05:38:36 +0000 (15:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 05:38:36 +0000 (15:38 +1000)
commit43dad223d3fee26a7e4195d0d4b65add0da14d2c
tree14081e6e0a5beb2022a2cfef6139a8ad8aea7357
parent3270afaece3b02f8ee54adfdd53ddfa1d07c38ad
parentceaaa12904df07d07ea8975abbf04c4d60e46956
Merge remote-tracking branch 'ftrace/for-next'

# Conflicts:
# arch/x86/kernel/kprobes/ftrace.c
include/trace/events/io_uring.h
include/trace/events/rcu.h
init/main.c
kernel/trace/bpf_trace.c
kernel/trace/ftrace.c
kernel/trace/trace.c