Merge "kill HAVE_INOTIFY"