Hi Mauro, On 25 October 2012 17:50, Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> wrote: > Hi Javier, > > Em Thu, 25 Oct 2012 15:27:08 +0200 > javier Martin <javier.martin@xxxxxxxxxxxxxxxxx> escreveu: > >> Hi Mauro, Jon, >> any more issues related with this series? > > Patch doesn't apply anymore: > > patching file drivers/media/i2c/ov7670.c > Hunk #2 succeeded at 191 (offset -32 lines). > Hunk #3 succeeded at 220 (offset -35 lines). > Hunk #4 succeeded at 1062 (offset -153 lines). > Hunk #5 succeeded at 1091 (offset -153 lines). > Hunk #6 succeeded at 1127 (offset -153 lines). > Hunk #7 succeeded at 1147 (offset -153 lines). > Hunk #8 succeeded at 1195 (offset -153 lines). > Hunk #9 succeeded at 1211 (offset -153 lines). > Hunk #10 succeeded at 1237 (offset -153 lines). > Hunk #11 succeeded at 1255 (offset -153 lines). > Hunk #12 succeeded at 1351 (offset -153 lines). > Hunk #13 FAILED at 1605. > Hunk #14 FAILED at 1616. > Hunk #15 succeeded at 1434 (offset -189 lines). > 2 out of 15 hunks FAILED -- rejects in file drivers/media/i2c/ov7670.c > > Could you please rebase it? I tried to force its merge, but > it seemed that the conflicts are not that trivial, so I prefer > if you could do it and test if everything still applies. You need to apply the series in the following order: Firstly: [PATCH v2 0/5] media: ov7670: driver cleanup and support for ov7674. Secondly: [PATCH v3 0/4] ov7670: migrate this sensor and its users to ctrl framework. This shouldn't cause any troubles. Otherwise, please let me know. Regards. -- Javier Martin Vista Silicon S.L. CDTUC - FASE C - Oficina S-345 Avda de los Castros s/n 39005- Santander. Cantabria. Spain +34 942 25 32 60 www.vista-silicon.com -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
