From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] AB8500 Power and MFD related updates
Date: Mon, 8 Apr 2013 10:33:03 +0100 [thread overview]
Message-ID: <20130408093303.GF3084@gmail.com> (raw)
In-Reply-To: <20130408091851.GI24058@zurbaran>
Hi Sam,
> > The following changes since commit 6dbe51c251a327e012439c4772097a13df43c5b8:
> >
> > Linux 3.9-rc1 (2013-03-03 15:11:05 -0800)
> >
> > are available in the git repository at:
> >
> > git://git.linaro.org/people/ljones/linux-3.0-ux500.git for-mfd-and-power
> I was expecting to get an MFD only branch (Basically what your for-mfd branch
> looks like, and then the for-mfd-and-power one to be based on the mfd only
> with the power patches applied on top of it.
> Now, I have to pull the power patches as well, which is no big deal but not
> ideal neither.
Sorry Sam, I guess I understood you differently:
"I can Ack the MFD parts, they look good to me. And then you can take
the whole thing through your tree, but I'd prefer you to do so by
pulling the branch Lee prepared for us. I want to avoid conflicts this
way."
When you said you wanted the "whole thing" to go through Anton's Tree,
I thought that's what you meant?
> Anyway, I pulled this branch into mfd-next, with a tiny conflict.
Okay, that's good.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2013-04-08 9:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-07 4:38 [GIT PULL] AB8500 Power and MFD related updates Lee Jones
2013-03-19 2:12 ` Anton Vorontsov
2013-04-08 9:18 ` Samuel Ortiz
2013-04-08 9:33 ` Lee Jones [this message]
2013-04-08 9:46 ` Samuel Ortiz
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=20130408093303.GF3084@gmail.com \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).