Merge "Revert "uevent.c: avoid POLLERR infinite loop"" into main