diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-11-07 13:18:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-11-07 13:18:49 +0100 |
| commit | 0a986ea81e1aa8ac17e82cda53cc95158217956e (patch) | |
| tree | a054b0ef413b7f327c04137c5768b2da6488511d | |
| parent | 6e426e0fcd20ce144bb93e00b70df51e9f2e08c3 (diff) | |
| parent | 36dadef23fcca55bb6531dc12822d3b165319ccc (diff) | |
Merge branch 'linus' into perf/kprobes
Merge recent kprobes updates into perf/kprobes that came from -mm.
Signed-off-by: Ingo Molnar <mingo@kernel.org>