Merge in the latest fixes, to avoid conflicts with ongoing work.
Signed-off-by: NIngo Molnar <mingo@kernel.org>