From: Tony Lindgren <tony@atomide.com>
To: Kevin Hilman <khilman@ti.com>
Cc: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL] misc. OMAP PM updates for v3.1
Date: Mon, 27 Jun 2011 12:22:12 -0700 [thread overview]
Message-ID: <20110627192211.GX23145@atomide.com> (raw)
In-Reply-To: <87oc1jcj7c.fsf@ti.com>
* Kevin Hilman <khilman@ti.com> [110627 09:45]:
> Tony Lindgren <tony@atomide.com> writes:
>
> > * Kevin Hilman <khilman@ti.com> [110623 17:32]:
> >> Tony,
> >>
> >> Please pull the following misc. OMAP PM updates targetted for v3.1.
> >>
> >> This branch is based on your 'fixes' branch due to some dependencies.
> >> OMAP2: PM debug: move wakeup timer into clockevent code
> >
> > This won't work with the devel-timer branch. I think we should just
> > drop it for now based on what I mentioned in the other thread.
>
> Hmm, so it's not just the wakeup timer that conflicts between
> devel-timer and my pm-misc branch.
>
> My branch also removes a bunch of other stuff from pm-debug.c and pm.h
> so it has overlapping changes with your devel-timer branch.
>
> The conflicts are easy enough to resolve since both branches are just
> removing code.
OK thanks for checking.
> Is your devel-timer branch stable now? Should I rebase my branch on top
> of devel-timer? or can you just handle the conflicts?
Just pushed what hopefully is the last version. But since there may
still be some comments, it's probably best that I resolve the
conflicts when merging.
Tony
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] misc. OMAP PM updates for v3.1
Date: Mon, 27 Jun 2011 12:22:12 -0700 [thread overview]
Message-ID: <20110627192211.GX23145@atomide.com> (raw)
In-Reply-To: <87oc1jcj7c.fsf@ti.com>
* Kevin Hilman <khilman@ti.com> [110627 09:45]:
> Tony Lindgren <tony@atomide.com> writes:
>
> > * Kevin Hilman <khilman@ti.com> [110623 17:32]:
> >> Tony,
> >>
> >> Please pull the following misc. OMAP PM updates targetted for v3.1.
> >>
> >> This branch is based on your 'fixes' branch due to some dependencies.
> >> OMAP2: PM debug: move wakeup timer into clockevent code
> >
> > This won't work with the devel-timer branch. I think we should just
> > drop it for now based on what I mentioned in the other thread.
>
> Hmm, so it's not just the wakeup timer that conflicts between
> devel-timer and my pm-misc branch.
>
> My branch also removes a bunch of other stuff from pm-debug.c and pm.h
> so it has overlapping changes with your devel-timer branch.
>
> The conflicts are easy enough to resolve since both branches are just
> removing code.
OK thanks for checking.
> Is your devel-timer branch stable now? Should I rebase my branch on top
> of devel-timer? or can you just handle the conflicts?
Just pushed what hopefully is the last version. But since there may
still be some comments, it's probably best that I resolve the
conflicts when merging.
Tony
next prev parent reply other threads:[~2011-06-27 19:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-24 0:37 [GIT PULL] misc. OMAP PM updates for v3.1 Kevin Hilman
2011-06-24 0:37 ` Kevin Hilman
2011-06-27 11:28 ` Tony Lindgren
2011-06-27 11:28 ` Tony Lindgren
2011-06-27 16:35 ` Kevin Hilman
2011-06-27 16:35 ` Kevin Hilman
2011-06-27 16:50 ` Kevin Hilman
2011-06-27 16:50 ` Kevin Hilman
2011-06-27 19:22 ` Tony Lindgren [this message]
2011-06-27 19:22 ` Tony Lindgren
2011-06-29 11:53 ` Tony Lindgren
2011-06-29 11:53 ` Tony Lindgren
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=20110627192211.GX23145@atomide.com \
--to=tony@atomide.com \
--cc=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.