From: Arnd Bergmann <arnd@arndb.de>
To: Kevin Hilman <khilman@ti.com>
Cc: linux-arm-kernel@lists.infradead.org,
Thomas Gleixner <tglx@linutronix.de>,
Nicolas Pitre <nicolas.pitre@linaro.org>,
linux-kernel@vger.kernel.org, Russell King <rmk@arm.linux.org.uk>
Subject: Re: Please submit platform trees for inclusion in arm-soc.git v3.1
Date: Mon, 11 Jul 2011 23:37:08 +0200 [thread overview]
Message-ID: <201107112337.08892.arnd@arndb.de> (raw)
In-Reply-To: <87wrfsahez.fsf@ti.com>
On Friday 08 July 2011, Kevin Hilman wrote:
> > Time is running out for the current cycle, so any changes that you
> > want to see merged in linux-3.1 through the arm-soc tree should be
> > submitted in form of pull-requests very soon.
>
> [...]
>
> It looks like your "remove rmk/for-next" commit may not have been
> totally complete.
>
> Trying to merge your master branch and Russell's current for-next branch
> still results in conflicts in files that should only be touched in
> Russell's branch (specifically, these seem related to changes in
> Russell's 'suspend' branch that is included in his 'for-next' branch.)
Yes, that's my fault for not fixing this up correctly after initially
doing the incorrect pull.
I guess I'll throw away the current master branch and generate a new
one. After discussing this with Russell, I think it's best to treat
the master branch as temporary anyway unless Nicolas or Thomas come up
with a good reason against doing this.
Arnd
next prev parent reply other threads:[~2011-07-11 21:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-01 18:18 Please submit platform trees for inclusion in arm-soc.git v3.1 Arnd Bergmann
2011-07-06 9:30 ` Nori, Sekhar
2011-07-06 11:12 ` Arnd Bergmann
2011-07-06 10:06 ` Barry Song
2011-07-08 16:03 ` Kevin Hilman
2011-07-11 21:37 ` Arnd Bergmann [this message]
2011-07-11 22:17 ` Nicolas Pitre
2011-07-12 12:55 ` Arnd Bergmann
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=201107112337.08892.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolas.pitre@linaro.org \
--cc=rmk@arm.linux.org.uk \
--cc=tglx@linutronix.de \
/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