[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <Pine.LNX.4.64.1602211749460.5959@axis700.grange>
Date: Sun, 21 Feb 2016 17:50:15 +0100 (CET)
From: Guennadi Liakhovetski <g.liakhovetski@....de>
To: Robert Jarzmik <robert.jarzmik@...e.fr>
cc: Mauro Carvalho Chehab <mchehab@....samsung.com>,
Jiri Kosina <trivial@...nel.org>, linux-media@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v5 1/4] media: pxa_camera: fix the buffer free path
On Sun, 21 Feb 2016, Robert Jarzmik wrote:
> Guennadi Liakhovetski <g.liakhovetski@....de> writes:
>
> >> Okay Guennadi, I retested this version on top of v4.5-rc2, still good to
> >> go. There is a minor conflict in the includes since this submission, and I can
> >> repost a v6 which solves it.
> >
> > How did you test it with that patchg #3??
> I rebased my patches on top of v4.5-rc2. To be exact, I rebased the tree I had
> with these last patches on top of v4.5-rc2. I'll recheck, it's been some time
> ...
>
> > What's a minor conflict?
> A conflict on a context line :
> #include <mach/dma.h>
> #include <linux/platform_data/media/camera-pxa.h>
>
> I think linux/platform_data/media/camera-pxa.h changed from my last submssion,
> hence the conflict.
>
> > If a patch doesn't apply at all or applies with a fuzz, yes, please fix. If
> > it's just a few lines off, no need to fix that. But you'll do a v6 anyway, I
> > assume.
> But of course, let us have a v6 which cleanly applies on v4.5-rc2, and restested
> once more. I'll try to have it done this evening.
Please, have a look at
http://git.linuxtv.org/gliakhovetski/v4l-dvb.git/log/?h=for-4.6-2
If all is good there, no need for a v6
Thanks
Guennadi
>
> Cheers.
>
> --
> Robert
>
Powered by blists - more mailing lists