From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]:62013 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756936Ab1CBUNp (ORCPT ); Wed, 2 Mar 2011 15:13:45 -0500 Message-ID: <4D6EA4EB.9070607@redhat.com> Date: Wed, 02 Mar 2011 17:13:31 -0300 From: Mauro Carvalho Chehab MIME-Version: 1.0 To: Laurent Pinchart CC: "linux-media@vger.kernel.org" , alsa-devel@alsa-project.org, Sakari Ailus , Pawel Osciak Subject: Re: [GIT PULL FOR 2.6.39] Media controller and OMAP3 ISP driver References: <201102171606.58540.laurent.pinchart@ideasonboard.com> In-Reply-To: <201102171606.58540.laurent.pinchart@ideasonboard.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit List-ID: Sender: 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 patches/0951-v4l-Share-code-between-video_usercopy-and-video_ioct.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 Patch patches/0951-v4l-Share-code-between-video_usercopy-and-video_ioct.patch 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? Thanks! Mauro.