From: kgene@kernel.org (Kukjin Kim)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 2/3 v2] 1st Round of Samsung PM updates for v3.19
Date: Wed, 05 Nov 2014 09:31:49 +0900 [thread overview]
Message-ID: <015101cff88f$e5790880$b06b1980$@kernel.org> (raw)
In-Reply-To: <20141104203502.GA3851@quad.lixom.net>
Olof Johansson wrote:
> On Tue, Oct 28, 2014 at 11:00:57AM +0900, Kukjin Kim wrote:
> > Hi,
> >
Hi,
> > I'm sending new pull-request for tags/samsung-pm-v2 instead of tags/samsung-pm.
> > Note that just added "fix build with ARM_CPU_SUSPEND=n" from Arnd, please pull.
> >
> > Thanks,
> > Kukjin
>
> Kukjin,
>
> The history here is somewhat odd. You've merged in cleanup and dt,
> and two merges of pm (one with just the extra fix from Arnd). Are the
> merges needed just to avoid merge conflicts? If so, we can resolve that
> when we merge here, that's not a problem.
>
Oops, probably I did 'checkout for-next' in my tree when I tagged
tags/samsung-pm-v2 :(
> If it's needed because pm doesn't work without the dt branch also being
> merged in, then this is not sufficient since when bisecting, you might get
> only the pm branch contents and not the dt contents in some circumstances.
>
> So, please confirm which of the cases it is, and resubmit just the bare
> pm branch if there are no dependencies.
>
Can you please merge branch v3.19-next/pm-samsung-2 instead?
If you don't want to merge just branch, I'll re-send with new tag.
Sorry for the inconvenience.
Thanks,
Kukjin
next prev parent reply other threads:[~2014-11-05 0:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-28 2:00 [GIT PULL 2/3 v2] 1st Round of Samsung PM updates for v3.19 Kukjin Kim
2014-11-04 20:35 ` Olof Johansson
2014-11-05 0:31 ` Kukjin Kim [this message]
2014-11-09 0:05 ` Olof Johansson
2014-11-09 4:45 ` 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='015101cff88f$e5790880$b06b1980$@kernel.org' \
--to=kgene@kernel.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).