Merge "Separate function to add fd to epoll"