Merge branch 'kexec' into next