Merge branch 'netlink-cleanups'