summaryrefslogtreecommitdiff
path: root/net/atm/addr.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/atm/addr.c')
0 files changed, 0 insertions, 0 deletions
3aaa756c69b343d6ab6f3357009b&id2=c67b42f3a3f03e68bf915f32c8f7be0b726fec1a'>diff)parentfff4b87e594ad3d2e4f51e8d3d86a6f9d3d8b654 (diff)
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar: "Five kernel fixes: - an mmap tracing ABI fix for certain mappings - a use-after-free fix, found via KASAN - three CPU hotplug related x86 PMU driver fixes" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/intel/uncore: Make package handling more robust perf/x86/intel/uncore: Clean up hotplug conversion fallout perf/x86/intel/rapl: Make package handling more robust perf/core: Fix PERF_RECORD_MMAP2 prot/flags for anonymous memory perf/core: Fix use-after-free bug
Diffstat (limited to 'include')
-rw-r--r--include/linux/cpuhotplug.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h