From: rjw@sisk.pl (Rafael J. Wysocki)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Samsung EXYNOS pm domains for devel
Date: Sat, 11 Feb 2012 00:42:39 +0100 [thread overview]
Message-ID: <201202110042.39803.rjw@sisk.pl> (raw)
In-Reply-To: <201202102334.29545.arnd@arndb.de>
On Saturday, February 11, 2012, Arnd Bergmann wrote:
> On Friday 10 February 2012, Rafael J. Wysocki wrote:
> > On Friday, February 10, 2012, Kukjin Kim wrote:
> > > Hi Arnd, Olof,
> > >
> > > Please pull samsung exynos pm domains.
> > >
> > > It has been merged into linux-pm tree by Rafael and I think it should be
> > > pulled into arm-soc.
> >
> > No, this doesn't work like this. A single patchset is not expected to be
> > present in two different trees at a time.
>
> We've been doing this for a number of other branches and I see nothing wrong
> with this approach as long as we can rely on both trees not to rebase the
> patches so the commit IDs remain stable.
>
> Rafael, do you want to keep the option of rebasing the patches that you
> got from Kukjin?
No, I'm not going to rebase them.
> If your workflow requires that, I can't take them, but
> if you can guarantee that the branch you have pulled them into is stable,
> I would prefer to pull it into a branch of arm-soc so that we can have
> other branches based on that where needed to avoid conflicts.
OK, the relevant branch is linux-pm/pm-domains and it won't be rebased.
Please feel free to pull from it.
Thanks,
Rafael
next prev parent reply other threads:[~2012-02-10 23:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-10 10:53 [GIT PULL] Samsung EXYNOS pm domains for devel Kukjin Kim
2012-02-10 22:05 ` Rafael J. Wysocki
2012-02-10 23:34 ` Arnd Bergmann
2012-02-10 23:42 ` Rafael J. Wysocki [this message]
2012-02-11 16:50 ` Arnd Bergmann
2012-02-11 17:57 ` Kukjin Kim
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=201202110042.39803.rjw@sisk.pl \
--to=rjw@sisk.pl \
--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).