On Mon, 1 Dec 2008, Mauro Carvalho Chehab wrote: > On Mon, 1 Dec 2008 14:22:17 +0100 (CET) > Guennadi Liakhovetski <g.liakhovetski@xxxxxx> wrote: > > > Hi Mauro, > > > > I have a series of two patches, of which the first _amends_ a pxa-header, > > creates a header under drivers/media/video/, and changes pxa_camera.c to > > include the new header: > > > > arch/arm/mach-pxa/include/mach/pxa-regs.h | 95 ----------------------------- > > drivers/media/video/pxa_camera.c | 2 + > > drivers/media/video/pxa_camera.h | 95 +++++++++++++++++++++++++++++ > > 3 files changed, 97 insertions(+), 95 deletions(-) > > create mode 100644 drivers/media/video/pxa_camera.h > > > > and the second one is based on the first: it only touches files under > > drivers/media/video, but needs results of the first one: > > > > drivers/media/video/pxa_camera.c | 204 ++++++++++++++++++++++++++++++-------- > > drivers/media/video/pxa_camera.h | 95 ------------------ > > 2 files changed, 162 insertions(+), 137 deletions(-) > > delete mode 100644 drivers/media/video/pxa_camera.h > > > > (yes, it deletes drivers/media/video/pxa_camera.h again... No, I don't > > like it either) > > Argh! Why inserting the header file just to delete on the next patch? > > > I acked the first one and it is going to be merged over the ARM tree, the > > second one we should merge ourselves. > > > > Shall we wait until the first one is in "next", so we can resync with it > > and then push the second one or how would you prefer to do this? > > For sure we need to wait for the first one to be at -next. Then, we should > apply it, with a meta tag "kernel-sync:", to not break the compilation of > v4l/dvb tree[1], and apply the second one. > > [1] The meta-tag will sign to my scripts to discard the patch, not exporting it to -git. So, the commit is now in next. Shall I create a pseudo-patch with only that one drivers/media/video/pxa_camera.h file added and a respective #include added to pxa_camera.c and merge it in my hg-tree for you to pull from? I understand I should just add a line with "kernel-sync:" alone in it in the patch description? Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer -- video4linux-list mailing list Unsubscribe mailto:video4linux-list-request@xxxxxxxxxx?subject=unsubscribe https://www.redhat.com/mailman/listinfo/video4linux-list