* [RESEND][PATCH 0/2] media, mfd: Add timberdale video-in driver
@ 2010-09-02 11:56 Richard Röjfors
2010-09-08 19:39 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 4+ messages in thread
From: Richard Röjfors @ 2010-09-02 11:56 UTC (permalink / raw)
To: Linux Kernel Mailing List
Cc: Linux Media Mailing List, Samuel Ortiz, Mauro Carvalho Chehab,
Douglas Schilling Landgraf, Andrew Morton
To follow are two patches.
The first adds the timberdale video-in driver to the media tree.
The second adds it to the timberdale MFD driver.
Samuel and Mauro hope you can support and solve the potential merge
issue between your two trees.
Thanks
--Richard
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [RESEND][PATCH 0/2] media, mfd: Add timberdale video-in driver
2010-09-02 11:56 [RESEND][PATCH 0/2] media, mfd: Add timberdale video-in driver Richard Röjfors
@ 2010-09-08 19:39 ` Mauro Carvalho Chehab
2010-09-13 13:39 ` Samuel Ortiz
0 siblings, 1 reply; 4+ messages in thread
From: Mauro Carvalho Chehab @ 2010-09-08 19:39 UTC (permalink / raw)
To: Richard Röjfors
Cc: Linux Kernel Mailing List, Linux Media Mailing List, Samuel Ortiz,
Douglas Schilling Landgraf, Andrew Morton
Em 02-09-2010 08:56, Richard Röjfors escreveu:
> To follow are two patches.
>
> The first adds the timberdale video-in driver to the media tree.
>
> The second adds it to the timberdale MFD driver.
>
> Samuel and Mauro hope you can support and solve the potential merge
> issue between your two trees.
If the conflicts are trivial, I can handle when merging upstream.
>
> Thanks
> --Richard
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [RESEND][PATCH 0/2] media, mfd: Add timberdale video-in driver
2010-09-08 19:39 ` Mauro Carvalho Chehab
@ 2010-09-13 13:39 ` Samuel Ortiz
2010-09-13 14:25 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 4+ messages in thread
From: Samuel Ortiz @ 2010-09-13 13:39 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Richard Röjfors, Linux Kernel Mailing List,
Linux Media Mailing List, Douglas Schilling Landgraf,
Andrew Morton
Hi Mauro,
On Wed, Sep 08, 2010 at 04:39:42PM -0300, Mauro Carvalho Chehab wrote:
> Em 02-09-2010 08:56, Richard Röjfors escreveu:
> > To follow are two patches.
> >
> > The first adds the timberdale video-in driver to the media tree.
> >
> > The second adds it to the timberdale MFD driver.
> >
> > Samuel and Mauro hope you can support and solve the potential merge
> > issue between your two trees.
>
> If the conflicts are trivial, I can handle when merging upstream.
Since the mfd part of this patchset has a build time dependency on the media
part, would you mind pushing both patches upstream through your tree ?
I'll ACK the mfd part.
Cheers,
Samuel.
> >
> > Thanks
> > --Richard
> >
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [RESEND][PATCH 0/2] media, mfd: Add timberdale video-in driver
2010-09-13 13:39 ` Samuel Ortiz
@ 2010-09-13 14:25 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 4+ messages in thread
From: Mauro Carvalho Chehab @ 2010-09-13 14:25 UTC (permalink / raw)
To: Samuel Ortiz
Cc: Richard Röjfors, Linux Kernel Mailing List,
Linux Media Mailing List, Douglas Schilling Landgraf,
Andrew Morton
Em 13-09-2010 10:39, Samuel Ortiz escreveu:
> Hi Mauro,
>
> On Wed, Sep 08, 2010 at 04:39:42PM -0300, Mauro Carvalho Chehab wrote:
>> Em 02-09-2010 08:56, Richard Röjfors escreveu:
>>> To follow are two patches.
>>>
>>> The first adds the timberdale video-in driver to the media tree.
>>>
>>> The second adds it to the timberdale MFD driver.
>>>
>>> Samuel and Mauro hope you can support and solve the potential merge
>>> issue between your two trees.
>>
>> If the conflicts are trivial, I can handle when merging upstream.
> Since the mfd part of this patchset has a build time dependency on the media
> part, would you mind pushing both patches upstream through your tree ?
> I'll ACK the mfd part.
Sure. This is probably a way simpler than the reverse ;)
Cheers,
Mauro
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-09-13 14:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-02 11:56 [RESEND][PATCH 0/2] media, mfd: Add timberdale video-in driver Richard Röjfors
2010-09-08 19:39 ` Mauro Carvalho Chehab
2010-09-13 13:39 ` Samuel Ortiz
2010-09-13 14:25 ` Mauro Carvalho Chehab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox