Google Git Google Git
Sign in
kernel/pub/scm/linux/kernel/git/rostedt/linux-trace/refs/heads/ftrace/conflicts
commit
8134a7d7b44586f0f9c035c1a628b6448989415f
[log]
author
Steven Rostedt (VMware) <rostedt@goodmis.org>
Mon Nov 01 15:04:42 2021 -0400
committer
Steven Rostedt (VMware) <rostedt@goodmis.org>
Mon Nov 01 15:04:42 2021 -0400
tree
297fb77d5d658f810cf79e1112a7e107dce1acbf
parent
8bb7eca972ad531c9b149c0a51ab43a417385813 [diff]
parent
feea69ec121f067073868cebe0cb9d003e64ad80 [diff] 
Merge branch 'trace/ftrace/core' into trace/ftrace/conflicts

Conflict resolution between 5.16 tracing updates and mainline.

 Conflicts:
	include/linux/trace_recursion.h
	kernel/trace/ftrace.c
tree: 297fb77d5d658f810cf79e1112a7e107dce1acbf
  1. arch/
  2. block/
  3. certs/
  4. crypto/
  5. Documentation/
  6. drivers/
  7. fs/
  8. include/
  9. init/
  10. ipc/
  11. kernel/
  12. lib/
  13. LICENSES/
  14. mm/
  15. net/
  16. samples/
  17. scripts/
  18. security/
  19. sound/
  20. tools/
  21. usr/
  22. virt/
  23. .clang-format
  24. .cocciconfig
  25. .get_maintainer.ignore
  26. .gitattributes
  27. .gitignore
  28. .mailmap
  29. COPYING
  30. CREDITS
  31. Kbuild
  32. Kconfig
  33. MAINTAINERS
  34. Makefile
  35. README