Merge branch 'bridge-netlink'