From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: "Richard Röjfors" <richard.rojfors@pelagicore.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Media Mailing List" <linux-media@vger.kernel.org>,
"Douglas Schilling Landgraf" <dougsland@gmail.com>,
"Andrew Morton" <akpm@linux-foundation.org>
Subject: Re: [RESEND][PATCH 0/2] media, mfd: Add timberdale video-in driver
Date: Mon, 13 Sep 2010 11:25:36 -0300 [thread overview]
Message-ID: <4C8E3460.3050504@redhat.com> (raw)
In-Reply-To: <20100913133951.GD2555@sortiz-mobl>
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
prev parent reply other threads:[~2010-09-13 14:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C8E3460.3050504@redhat.com \
--to=mchehab@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=dougsland@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=richard.rojfors@pelagicore.com \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox