Home » Mailing list archives » linux-kernel » 2010 » April » 7

linux-next: manual merge of the v4l-dvb tree with Linus' tree

Previous thread: [PATCH 2/2] ftrace: Use local_irq_{save,restore}_nmi() in tracers. by David Miller on Tuesday, April 6, 2010 - 4:40 pm. (4 messages)

Next thread: none
[view original message]
From: Stephen Rothwell
Subject: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Date: Tuesday, April 6, 2010 - 6:00 pm

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@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>
--


[ message continues ]
[view original message]
From: Mauro Carvalho Chehab
Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Date: Thursday, April 8, 2010 - 10:22 pm

Hi Stephen,


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
--


[ message continues ]
[view original message]
From: Stephen Rothwell
Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Date: Friday, April 9, 2010 - 12:13 am

Hi Mauro,


Excellent, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[ message continues ]
Previous thread: [PATCH 2/2] ftrace: Use local_irq_{save,restore}_nmi() in tracers. by David Miller on Tuesday, April 6, 2010 - 4:40 pm. (4 messages)

Next thread: none