Merge branch 'topic/defer_probe' into for-linus