From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: Re: linux-next: manual merge of the mfd tree with the v4l-dvb tree
Date: Wed, 10 Apr 2013 06:48:28 -0300 [thread overview]
Message-ID: <20130410064828.6c946ad8@redhat.com> (raw)
In-Reply-To: <20130410064253.GA4874@zurbaran>
Em Wed, 10 Apr 2013 08:42:53 +0200
Samuel Ortiz <sameo@linux.intel.com> escreveu:
> Hi Stephen,
>
> On Wed, Apr 10, 2013 at 01:48:13PM +1000, Stephen Rothwell wrote:
> > Hi Samuel,
> >
> > Today's linux-next merge of the mfd tree got a conflict in
> > drivers/mfd/Kconfig between commit 3f8ec5df11aa ("[media] mfd: Add header
> > files and Kbuild plumbing for SI476x MFD core") from the v4l-dvb tree and
> > commit ab85b120e692 ("mfd: Kconfig alphabetical re-ordering") from the
> > mfd tree.
> I'm surprised the v4l-dvb tree is carrying this patchset because I haven't
> ACKed it.
Sorry. Not sure why I understood that you gave your ack. Perhaps I miss-read
one of the comments of that thread.
> I was planning to take the MFD bits of it and provide Mauro a branch
> to pull from (Including the mfd/Kconfig change).
> Mauro, could we please go that way instead ? This conflict does not look
> pretty to me.
Sure. Do you have such branch already? As the patches are on my main
tree[1], I'll need to either revert them or to do a merge from your
branch. The latter is likely a little cleaner, but I'm ok with either ways.
Regards,
Mauro
[1] Currently, we're not using topic branches yet. I'm planning to do it
for 3.11. So, once a patch got merged, I can't remove it, as I don't
rebase my tree.
Regards,
Mauro
next prev parent reply other threads:[~2013-04-10 9:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-10 3:48 linux-next: manual merge of the mfd tree with the v4l-dvb tree Stephen Rothwell
2013-04-10 6:42 ` Samuel Ortiz
2013-04-10 9:48 ` Mauro Carvalho Chehab [this message]
2013-04-10 9:58 ` Samuel Ortiz
2013-04-16 13:51 ` Samuel Ortiz
2013-04-16 13:59 ` Mauro Carvalho Chehab
2013-04-16 16:25 ` Andrey Smirnov
2013-04-16 19:23 ` Samuel Ortiz
2013-04-17 9:14 ` Mauro Carvalho Chehab
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=20130410064828.6c946ad8@redhat.com \
--to=mchehab@redhat.com \
--cc=andrew.smirnov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=sfr@canb.auug.org.au \
/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