Hi Richard, On Tue, Feb 09, 2010 at 09:43:38PM +0000, Richard Röjfors wrote: > On 2/4/10 10:28 AM, Samuel Ortiz wrote: > > On Wed, Feb 03, 2010 at 05:23:57PM +0000, Mauro Carvalho Chehab wrote: > >>> Ok, thanks again for your understanding. This is definitely material for the > >>> next merge window, so I'll merge it into my for-next branch. > >> > >> The last version of the driver is OK for merging. However, I noticed one issue: > >> it depends on two drivers that were already merged on my tree: > >> > >> +config RADIO_TIMBERDALE > >> + tristate "Enable the Timberdale radio driver" > >> + depends on MFD_TIMBERDALE && VIDEO_V4L2 > >> + select RADIO_TEF6862 > >> + select RADIO_SAA7706H > >> > >> Currently, the dependency seems to happen only at Kconfig level. > >> > >> Maybe the better is to return to the previous plan: apply it via my tree, as the better > >> is to have it added after those two radio i2c drivers. > > I'm fine with that. Richard sent me a 2nd version of his patch that I was > > about to merge. > > Richard, could you please post this patch here, or to lkml with Mauro cc'ed ? > > I'll add my SOB to it and then it will go through Mauro's tree. > > Now when the radio driver made it into the media tree, can I post an > updated MFD which defines these drivers too? > Is a complete MFD patch preferred, or just an incremental against the > last one? Since the mfd driver is currently merged into Mauro's tree, you should make incremental patches against it. At least that's how I'd take it in my tree. Mauro, do you agree ? Cheers, Samuel. > > --Richard -- Intel Open Source Technology Centre http://oss.intel.com/ --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. -- 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
