Hans & Mauro, I have already replied to Mauro's email. This is what we had followed last time for vpfe capture. Mauro will merge the v4l2 part and Kevin will merge the arch part. These needs be done in sync so that it will compile fine in the upstream. Let me know if this cannot be done this time. Murali Karicheri Software Design Engineer Texas Instruments Inc. Germantown, MD 20874 phone: 301-407-9583 email: m-karicheri2@xxxxxx >-----Original Message----- >From: Hans Verkuil [mailto:hverkuil@xxxxxxxxx] >Sent: Thursday, December 17, 2009 6:30 AM >To: Mauro Carvalho Chehab >Cc: linux-media@xxxxxxxxxxxxxxx; Karicheri, Muralidharan >Subject: Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-davinci > > >> Hans Verkuil wrote: >>> Hi Mauro, >>> >>> Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-davinci for >>> the following: >>> >>> - v4l: vpfe_capture: remove clock and ccdc resource handling >>> - v4l: vpfe capture: convert dm355 ccdc driver to a platform driver >>> - v4l: vpfe capture: convert dm644x ccdc module to a platform driver >>> >>> And after these three patches are pulled in, then this arch patch should >>> also be >>> merged for git: >>> >>> http://patchwork.kernel.org/patch/67669/ >> >> Hmm... It seems that git bisect will break if I merge first the >conversion >> and then >> the platform_data patches. > >Murali, what is the correct merge order? I assumed that the order you gave >me was 'safe' (as in, it always compiles after each patch). I did compile >the v4l patches, but I did not check if there was any breakage if I build >the full kernel. > >> Also, we had some bad merge dependency troubles last time I merged an >arch >> patch >> on my tree, as those omap arch header files are highly volatile. I bet >> that, if I >> merge the patch #67669 on my tree it will cause conflicts when I send it >> during >> the next merge window (and it is too late for sending those patches to >> linux-next, >> wait for a couple days and send upstream before -rc1). >> >> Cheers, >> Mauro. >> > >So what do you want me or Murali to do? Wait until rc1 is released and >then make sure that the arch patch will apply correctly to what is in rc1? > >Regards, > > Hans > >-- >Hans Verkuil - video4linux developer - sponsored by TANDBERG Telecom -- 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
