diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 23:38:16 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 23:38:16 +0100 |
| commit | c3abcabe813b4a0976b58f7e6c1e63b2070c8dda (patch) | |
| tree | 72d7719e484340ddca3d5cf2710823f25a5d6542 /drivers/net | |
| parent | Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | Merge branch 'linus' into perf/urgent, to resolve conflict (diff) | |
| download | linux-c3abcabe813b4a0976b58f7e6c1e63b2070c8dda.tar.xz linux-c3abcabe813b4a0976b58f7e6c1e63b2070c8dda.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"This includes a fix for a crash if certain special addresses are
kprobed, plus does a rename of two Kconfig variables that were a minor
misnomer"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/core: Rename CONFIG_[UK]PROBE_EVENT to CONFIG_[UK]PROBE_EVENTS
kprobes/x86: Fix kernel panic when certain exception-handling addresses are probed
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions