diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2015-12-04 10:30:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-12-04 10:30:35 +0100 |
| commit | 829cf31751aa1c50b1527c1e0c821c99246b5639 (patch) | |
| tree | a6542c021c3d3b78c5618319bc3b4a6aefa3f0e7 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | locking/pvqspinlock, x86: Optimize the PV unlock code path (diff) | |
| parent | sched/core: Fix an SMP ordering race in try_to_wake_up() vs. schedule() (diff) | |
| download | linux-dev-829cf31751aa1c50b1527c1e0c821c99246b5639.tar.xz linux-dev-829cf31751aa1c50b1527c1e0c821c99246b5639.zip | |
Merge branch 'sched/urgent' into locking/core, to pick up scheduler fix we rely on
So we want to change a locking API, but the scheduler uses it, and a conflict
is generated by a recent scheduler fix.
Pick up the pending scheduler fixes to make life easier.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions