[alsa-devel] [GIT PULL FOR 2.6.39] Media controller and OMAP3 ISP driver
laurent.pinchart at ideasonboard.com
Thu Mar 3 10:29:41 CET 2011
On Wednesday 02 March 2011 21:13:31 Mauro Carvalho Chehab wrote:
> Em 17-02-2011 13:06, Laurent Pinchart escreveu:
> > v4l: Share code between video_usercopy and video_ioctl2
> Two hunks failed on this patch:
> $ quilt push
> Applying patch
> patching file drivers/media/video/v4l2-ioctl.c
> Hunk #1 FAILED at 325.
> Hunk #2 succeeded at 332 (offset -33 lines).
> Hunk #3 succeeded at 368 (offset -33 lines).
> Hunk #4 succeeded at 397 (offset -33 lines).
> Hunk #5 FAILED at 1982.
> 2 out of 5 hunks FAILED -- rejects in file drivers/media/video/v4l2-ioctl.c
> does not apply (enforce with -f)
> Basically, the code for video_ioctl2 suffered some recent changes. I
> suspect that the blamed patch is this one:
> cff7fbc6 (Pawel Osciak 2010-12-23 04:15:27 -0300 2342)
> bool has_array_args; cff7fbc6 (Pawel Osciak 2010-12-23
> 04:15:27 -0300 2343) size_t array_size = 0;
> Could you please fix the merge conflicts?
Sure. I'm working on that right now, I'll send a new pull request.
More information about the Alsa-devel