merge in KFS78N (no-op)
tree: a8732e1fa69107c0e9a44a07155d7714fc0de411
  1. kernel