Merge branch 'kernel-update' into next