Hi all,
Today's linux-next merge of the net-next tree got a conflict in
fs/select.c between commit 9745cdb36da8 ("select: use freezable blocking
call") from the pm tree and commit 2d48d67fa8cd ("net: poll/select low
latency socket support") from the net-next tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc fs/select.c index 6b14dc7,79b876e..0000000 --- a/fs/select.c +++ b/fs/select.c @@@ -27,7 -27,7 +27,8 @@@ #include <linux/rcupdate.h> #include <linux/hrtimer.h> #include <linux/sched/rt.h> +#include <linux/freezer.h> + #include <net/ll_poll.h> #include <asm/uaccess.h>
pgp8NSddAQ7CX.pgp
Description: PGP signature
