Merge branch 'net-simple-kerneldoc-fixes'