[Christoph, I noticed that the comment above datagram_poll in
net/core/datagram.c needs the function name updated]

I'll send a fix for that.

I have added the following merge fix patch for today:

This looks correct, thanks!