diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-13 08:47:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-13 08:47:22 +0200 |
| commit | 3f365cf304ba3d316b3df2474af8d7df6edd2455 (patch) | |
| tree | bb52465b35606bec268e9c1b88c746f8caf0f919 /fs/orangefs/orangefs-mod.c | |
| parent | bbf79d21bd4627a01ca8721c9373752819f8e4cc (diff) | |
| parent | 252d2a4117bc181b287eeddf848863788da733ae (diff) | |
| download | blackbird-obmc-linux-3f365cf304ba3d316b3df2474af8d7df6edd2455.tar.gz blackbird-obmc-linux-3f365cf304ba3d316b3df2474af8d7df6edd2455.zip | |
Merge branch 'sched/urgent' into x86/mm, to pick up dependent fix
Andy will need the following scheduler fix for the PCID series:
252d2a4117bc: sched/core: Idle_task_exit() shouldn't use switch_mm_irqs_off()
So do a cross-merge.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/orangefs/orangefs-mod.c')
0 files changed, 0 insertions, 0 deletions
