am d8e38e1b: Merge "kill HAVE_INOTIFY"

* commit 'd8e38e1b1ad62a2c2f981ce0bafd40f0cee5dcef':
  kill HAVE_INOTIFY