diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-17 10:37:46 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-17 10:37:46 -0700 |
commit | a706797febf4ff60ad61f855a01707be9fc3cf4c (patch) | |
tree | 3046e1dfb6d0c7b1214421ae19018f116da105e8 /include/net/cipso_ipv4.h | |
parent | 9786cff38a31c452e32fd2f9a479dd7d19d91712 (diff) | |
parent | f6cf87f748ff9480f97ff9c5caf6d6faacf52aa1 (diff) | |
download | linux-stable-a706797febf4ff60ad61f855a01707be9fc3cf4c.tar.gz linux-stable-a706797febf4ff60ad61f855a01707be9fc3cf4c.tar.bz2 linux-stable-a706797febf4ff60ad61f855a01707be9fc3cf4c.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:
"Mostly tooling fixes, but also two x86 PMU driver fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf tests: Fix software clock events test setting maps
perf tests: Fix task exit test setting maps
perf evlist: Fix create_syswide_maps() not propagating maps
perf evlist: Fix add() not propagating maps
perf evlist: Factor out a function to propagate maps for a single evsel
perf evlist: Make create_maps() use set_maps()
perf evlist: Make set_maps() more resilient
perf evsel: Add own_cpus member
perf evlist: Fix missing thread_map__put in propagate_maps()
perf evlist: Fix splice_list_tail() not setting evlist
perf evlist: Add has_user_cpus member
perf evlist: Remove redundant validation from propagate_maps()
perf evlist: Simplify set_maps() logic
perf evlist: Simplify propagate_maps() logic
perf top: Fix segfault pressing -> with no hist entries
perf header: Fixup reading of HEADER_NRCPUS feature
perf/x86/intel: Fix constraint access
perf/x86/intel/bts: Set event->hw.itrace_started in pmu::start to match the new logic
perf tools: Fix use of wrong event when processing exit events
perf tools: Fix parse_events_add_pmu caller
Diffstat (limited to 'include/net/cipso_ipv4.h')
0 files changed, 0 insertions, 0 deletions