Merge branch 'next'

* next:
  fix, PEBKAC, define a version of struct rotz_s for rotz-fsck