| commit | ca8778c45e401067cefe2abbfb8b547c30d45908 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Sun Mar 21 22:16:08 2021 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Sun Mar 21 22:16:08 2021 +0100 |
| tree | c10beaf40adb2bbc6a8933f87ff9da7a5366bf42 | |
| parent | 21d6a7dcbfba5e7b31f4e9d555a9be362578bfc3 [diff] | |
| parent | 2c41fab1c60b02626c8153a1806a7a1e5d62aaf1 [diff] |
Merge branch 'linus' into x86/cleanups, to resolve conflict Conflicts: arch/x86/kernel/kprobes/ftrace.c Signed-off-by: Ingo Molnar <mingo@kernel.org>