Merge branch 'topic/kbuild' into next

Merge in some commits we're sharing with the kbuild tree.