Merge branch 'next'

* next:
  chore, hygiene, assume epoll events are ui32, don't use typeof() macro in cli/umpf.c