Merge branch 'net-devlink-couple-of-trivial-fixes'