From: Tony Lindgren <tony@atomide.com>
To: Olof Johansson <olof@lixom.net>
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1
Date: Tue, 6 Nov 2012 09:59:59 -0800 [thread overview]
Message-ID: <20121106175959.GC6801@atomide.com> (raw)
In-Reply-To: <20121105185133.GC22301@quad.lixom.net>
* Olof Johansson <olof@lixom.net> [121105 10:53]:
>
> The history of this branch looks a little odd. Did you mean to merge in
> cleanup-headers on top of Paul's branch in it? It seems to add no value -- all
> that code is already in our branch and it resolves no conflicts, etc.
Oh that was because I wanted to keep the header clean up separate
and Paul needed some base for further PRCM work that would not
conflict with the header changes. And I wanted to get the first
set of Paul's changes into linux next early to avoid a big pile
of pull requests later on.
> That being said, it causes no harm, and I've pulled it in as is.
OK thanks.
Regards,
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 3/3] omap prcm cleanup for v3.8 merge window, part1
Date: Tue, 6 Nov 2012 09:59:59 -0800 [thread overview]
Message-ID: <20121106175959.GC6801@atomide.com> (raw)
In-Reply-To: <20121105185133.GC22301@quad.lixom.net>
* Olof Johansson <olof@lixom.net> [121105 10:53]:
>
> The history of this branch looks a little odd. Did you mean to merge in
> cleanup-headers on top of Paul's branch in it? It seems to add no value -- all
> that code is already in our branch and it resolves no conflicts, etc.
Oh that was because I wanted to keep the header clean up separate
and Paul needed some base for further PRCM work that would not
conflict with the header changes. And I wanted to get the first
set of Paul's changes into linux next early to avoid a big pile
of pull requests later on.
> That being said, it causes no harm, and I've pulled it in as is.
OK thanks.
Regards,
Tony
next prev parent reply other threads:[~2012-11-06 18:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-26 21:23 [GIT PULL 1/3] omap plat header removal for v3.8 merge window, part2 Tony Lindgren
2012-10-26 21:23 ` [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1 Tony Lindgren
2012-10-26 21:23 ` Tony Lindgren
2012-11-05 18:51 ` Olof Johansson
2012-11-05 18:51 ` Olof Johansson
2012-11-06 17:59 ` Tony Lindgren [this message]
2012-11-06 17:59 ` Tony Lindgren
2012-10-26 21:23 ` [GIT PULL 2/3] omap plat header removal for v3.8 merge window, part3 Tony Lindgren
2012-10-26 21:23 ` Tony Lindgren
[not found] ` <508aff60.4688e50a.0457.ffff898bSMTPIN_ADDED@mx.google.com>
2012-11-05 18:31 ` Olof Johansson
2012-11-05 18:31 ` Olof Johansson
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=20121106175959.GC6801@atomide.com \
--to=tony@atomide.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=olof@lixom.net \
/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.