Subject: Re: linux-next: manual merge of the v4l-dvb tree

From: Hans Verkuil <[email-masked]>
Date: Tue, 19 Aug 2008 07:59:01 +0200

On Tuesday 19 August 2008 06:11:13 Stephen Rothwell wrote:
> Hi Mauro,
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/video/zr364xx.c between commit
> 8aac48f4f2460b00468fd5f1101addf3df04e94c ("USB: remove info() macro
> from usb.h") from the usb tree and commit
> dcdbac23cc15325ae04696803537b35bb0bcb3cb ("V4L/DVB (8613): v4l: move
> BKL down to the driver level") from the v4l-dvb tree.
>
> A context clashing change and addition.  I fixed it up (see below)
> and can carry it.

Signed-off-by: Hans Verkuil <[email-masked]>

Thanks!

	Hans