linux-next: manual merge of the v4l-dvb tree with Linus' tree
in [Kernel]
|
Prev: Add a tunable that decides when memory should be compacted and when it should be reclaimed
Next: ahci 0000:00:1f.2: controller reset failed (0xffffffff)
From: Stephen Rothwell on 6 Apr 2010 21:10 Hi Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in drivers/media/video/meye.c between commit 5a0e3ad6af8660be21ca98a971cd00f331318c05 ("include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h") from Linus' tree and commit b214778b09229f9135e715bf346c25f98c8ac1e4 ("V4L/DVB: meye: remove last V4L1 remnants from the code and add v4l2_device") from the v4l-dvb tree. Just context changes. I fixed it up (see below) and can carry the change for a while. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc drivers/media/video/meye.c index 4404e5e,9c7f282..0000000 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c @@@ -30,9 -30,9 +30,10 @@@ #include <linux/pci.h> #include <linux/sched.h> #include <linux/init.h> - #include <linux/videodev.h> + #include <linux/videodev2.h> +#include <linux/gfp.h> #include <media/v4l2-common.h> + #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> #include <asm/uaccess.h> #include <asm/io.h> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Mauro Carvalho Chehab on 9 Apr 2010 01:30 Hi Stephen, Stephen Rothwell wrote: > Hi Mauro, > > Today's linux-next merge of the v4l-dvb tree got a conflict in > drivers/media/video/meye.c between commit > 5a0e3ad6af8660be21ca98a971cd00f331318c05 ("include cleanup: Update gfp.h > and slab.h includes to prepare for breaking implicit slab.h inclusion > from percpu.h") from Linus' tree and commit > b214778b09229f9135e715bf346c25f98c8ac1e4 ("V4L/DVB: meye: remove last > V4L1 remnants from the code and add v4l2_device") from the v4l-dvb tree. > > Just context changes. I fixed it up (see below) and can carry the change > for a while. Thanks for pointing it to me. Fixed. I also fixed today a conflict that it would appear on your next pull, between input and v4l-dvb, due to the upstream changes of keytable ops from int to unsigned. -- Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 9 Apr 2010 03:20
Hi Mauro, On Fri, 09 Apr 2010 02:22:29 -0300 Mauro Carvalho Chehab <mchehab(a)infradead..org> wrote: > > Thanks for pointing it to me. Fixed. > > I also fixed today a conflict that it would appear on your next pull, between > input and v4l-dvb, due to the upstream changes of keytable ops from > int to unsigned. Excellent, thanks. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ |