From: Tony Lindgren <tony@atomide.com>
To: Paul Walmsley <paul@pwsan.com>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL] OMAP: SoC data/core: cleanups for 3.1
Date: Tue, 12 Jul 2011 23:49:50 -0700 [thread overview]
Message-ID: <20110713064949.GI5783@atomide.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1107130037140.30229@utopia.booyaka.com>
* Paul Walmsley <paul@pwsan.com> [110712 23:33]:
> Hi Tony,
>
> On Mon, 11 Jul 2011, Tony Lindgren wrote:
>
> > Paul, please use the mainline tags or linux-omap static branches
> > instead of the arm-soc branches. In this case there's only the extra
> > merge commit there, so not a problem. Now it just makes it a bit
> > harder for me to do pull requests and diffs to other branches.
> >
> > In general, we want to keep the dependencies between branches and
> > other trees to minimum.
>
> Sorry about that. It was a misunderstanding on my part.
No problem, we should probably document that in the wiki page..
> Would you like me to rebase the prcm-fixes-3.1 and prcm-devel-3.1 branches
> on a different branch/commit?
No need to, they're already all pulled in and in arm-soc waiting
for the merge window.
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] OMAP: SoC data/core: cleanups for 3.1
Date: Tue, 12 Jul 2011 23:49:50 -0700 [thread overview]
Message-ID: <20110713064949.GI5783@atomide.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1107130037140.30229@utopia.booyaka.com>
* Paul Walmsley <paul@pwsan.com> [110712 23:33]:
> Hi Tony,
>
> On Mon, 11 Jul 2011, Tony Lindgren wrote:
>
> > Paul, please use the mainline tags or linux-omap static branches
> > instead of the arm-soc branches. In this case there's only the extra
> > merge commit there, so not a problem. Now it just makes it a bit
> > harder for me to do pull requests and diffs to other branches.
> >
> > In general, we want to keep the dependencies between branches and
> > other trees to minimum.
>
> Sorry about that. It was a misunderstanding on my part.
No problem, we should probably document that in the wiki page..
> Would you like me to rebase the prcm-fixes-3.1 and prcm-devel-3.1 branches
> on a different branch/commit?
No need to, they're already all pulled in and in arm-soc waiting
for the merge window.
Regards,
Tony
next prev parent reply other threads:[~2011-07-13 6:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-10 2:37 [GIT PULL] OMAP: SoC data/core: cleanups for 3.1 Paul Walmsley
2011-07-10 2:37 ` Paul Walmsley
2011-07-11 8:32 ` Tony Lindgren
2011-07-11 8:32 ` Tony Lindgren
2011-07-13 6:38 ` Paul Walmsley
2011-07-13 6:38 ` Paul Walmsley
2011-07-13 6:49 ` Tony Lindgren [this message]
2011-07-13 6:49 ` 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=20110713064949.GI5783@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.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.