From: Arnd Bergmann <arnd@arndb.de>
To: Tony Lindgren <tony@atomide.com>
Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org
Subject: Re: [GIT PULL] omap fixes for -rc series and merge window
Date: Fri, 7 Oct 2011 22:12:50 +0200 [thread overview]
Message-ID: <201110072212.50552.arnd@arndb.de> (raw)
In-Reply-To: <20111007192041.GN6324@atomide.com>
On Friday 07 October 2011, Tony Lindgren wrote:
> Then merge all the -rc fixes for various ARM platforms with:
>
> $ git checkout fixes-for-rc
> $ git reset --hard v3.1-rc9
> $ git merge omap/fixes-for-rc soc foo/fixes-for-rc bar/fixes-for-rc
>
> And then no rebasing is needed. Of course I could also set up
> a separate fixes-for-rc for that if you prefrer that :)
Right, that works. I normally have a 'fixes' branch for the current
release and a 'next/fixes' branch for stuff that should wait for the
merge window.
Unfortunately, some of the stuff I already merged into 'fixes' turned
out not to be 3.1 material after all. Adding a third branch of course
works, so I can do that tomorrow.
Thanks for the suggestion.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] omap fixes for -rc series and merge window
Date: Fri, 7 Oct 2011 22:12:50 +0200 [thread overview]
Message-ID: <201110072212.50552.arnd@arndb.de> (raw)
In-Reply-To: <20111007192041.GN6324@atomide.com>
On Friday 07 October 2011, Tony Lindgren wrote:
> Then merge all the -rc fixes for various ARM platforms with:
>
> $ git checkout fixes-for-rc
> $ git reset --hard v3.1-rc9
> $ git merge omap/fixes-for-rc soc foo/fixes-for-rc bar/fixes-for-rc
>
> And then no rebasing is needed. Of course I could also set up
> a separate fixes-for-rc for that if you prefrer that :)
Right, that works. I normally have a 'fixes' branch for the current
release and a 'next/fixes' branch for stuff that should wait for the
merge window.
Unfortunately, some of the stuff I already merged into 'fixes' turned
out not to be 3.1 material after all. Adding a third branch of course
works, so I can do that tomorrow.
Thanks for the suggestion.
Arnd
next prev parent reply other threads:[~2011-10-07 20:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-03 18:52 [GIT PULL] omap fixes for -rc series and merge window Tony Lindgren
2011-10-03 18:52 ` Tony Lindgren
2011-10-07 19:11 ` Arnd Bergmann
2011-10-07 19:11 ` Arnd Bergmann
2011-10-07 19:20 ` Tony Lindgren
2011-10-07 19:20 ` Tony Lindgren
2011-10-07 20:12 ` Arnd Bergmann [this message]
2011-10-07 20:12 ` 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=201110072212.50552.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/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.