> > $ cat drivers/media/rc/lirc_dev.c.rej > --- drivers/media/rc/lirc_dev.c > +++ drivers/media/rc/lirc_dev.c > @@ -18,7 +18,7 @@ > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > #include <linux/module.h> > -#include <linux/sched/signal.h> > +#include <linux/sched.h> > #include <linux/ioctl.h> > #include <linux/poll.h> > #include <linux/mutex.h> >
A bit of staring brings this to light: The file that is being patched has extra lines relative to the patch 18 #undef pr_fmt 19 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 20 21 #include <linux/module.h> ** 22 #include <linux/kernel.h> 23 #include <linux/sched/signal.h> ** 24 #include <linux/errno.h> 25 #include <linux/ioctl.h> 26 #include <linux/fs.h> 27 #include <linux/poll.h> 28 #include <linux/completion.h> 29 #include <linux/mutex.h> 30 #include <linux/wait.h> This hunk applies cleanly, and seems to match up with recent kernel code (eg 174cd4b1e5fbd0d74c68cf3a74f5bd4923485512 sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>) @@ -20,7 +20,7 @@ #include <linux/module.h> #include <linux/kernel.h> -#include <linux/sched/signal.h> +#include <linux/sched.h> #include <linux/errno.h> #include <linux/ioctl.h> #include <linux/fs.h> HTH Vince