Merge branch 'linus' into sched/locking

Merge reason: Pick up this upstream commit:

  6631e635: block: don't flush plugged IO on forced preemtion scheduling

As it modifies the scheduler and we'll queue up dependent patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>