From: Daniel Walker <dwalker@fifo99•com>
To: Arnd Bergmann <arnd@arndb•de>
Cc: Nicolas Pitre <nico@fluxnic•net>,
Russell King <rmk@arm•linux.org.uk>,
Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jeremy Kerr <jeremy.kerr@canonical•com>,
Jeff Ohlstein <johlstei@codeaurora•org>
Subject: Re: linux-next: manual merge of the msm tree with the arm tree
Date: Mon, 18 Oct 2010 14:05:28 -0700 [thread overview]
Message-ID: <1287435928.5588.37.camel@c-dwalke-linux.qualcomm.com> (raw)
In-Reply-To: <201010182248.36078.arnd@arndb.de>
On Mon, 2010-10-18 at 22:48 +0200, Arnd Bergmann wrote:
> On Monday 18 October 2010 22:37:31 Daniel Walker wrote:
> > > When you know that Russell does not rebase his tree, you can pull his
> > > tree into yours whenever a change hits his tree that impacts you in
> > > a major way. You shouldn't do this too frequently, but it's a good way
> > > to resolve conflicts like this one.
> >
> > If I did that all of Russell's changesets would get mixed with mine when
> > I send the pull request .. That would just create confusion .. It's OK
> > if Russell sends my commits to Linus, but I'm not going to send
> > Russell's commits.
>
> Actually both are ok, as long as you as the sub-maintainer send your
> pull request after Russell's tree has been merged and you don't
> ask anyone else to pull your tree who has not pulled Russell's tree
> explicitly or implicitly through Linus.
>
> git-request-pull is smart enough to list only the changesets that
> are not in the upstream tree, as will git "log your-branch...upstream"
> or "git diff your-branch upstream".
I guess your assuming I send my pull request after Russell's, which
isn't necessarily true, and I'd rather not have that dependency if I
don't have to.
Even with a one time event what your suggesting seems like it would be
some what freaky. I wouldn't want to wait around for Russell to get his
tree merged before I can get a reasonable log of my own activities
(without jumping through hoops).
Of course I could do what your suggesting, I just don't think it's the
easiest way to fix this.
Daniel
next prev parent reply other threads:[~2010-10-18 21:05 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-17 23:35 linux-next: manual merge of the msm tree with the arm tree Stephen Rothwell
2010-10-18 0:02 ` Stephen Rothwell
2010-10-18 8:15 ` Russell King
2010-10-18 17:26 ` Daniel Walker
2010-10-18 18:20 ` Russell King
2010-10-18 18:46 ` Daniel Walker
2010-10-18 19:29 ` Nicolas Pitre
2010-10-18 20:12 ` Daniel Walker
2010-10-18 20:19 ` Arnd Bergmann
2010-10-18 20:37 ` Daniel Walker
2010-10-18 20:48 ` Arnd Bergmann
2010-10-18 21:05 ` Daniel Walker [this message]
2010-10-18 21:17 ` Nicolas Pitre
2010-10-18 21:35 ` Daniel Walker
2010-10-18 21:11 ` Nicolas Pitre
2010-10-18 20:58 ` Russell King
2010-10-18 21:29 ` Daniel Walker
2010-10-18 21:58 ` Russell King
2010-10-18 22:27 ` Daniel Walker
2010-10-18 22:35 ` Nicolas Pitre
2010-10-18 22:53 ` Joe Perches
2010-10-19 13:18 ` Arnd Bergmann
2010-10-19 17:03 ` Daniel Walker
2010-10-19 17:18 ` Nicolas Pitre
2010-10-19 18:42 ` Daniel Walker
2010-10-19 18:53 ` Russell King
2010-10-19 19:24 ` Daniel Walker
2010-10-19 18:34 ` Russell King
2010-10-19 18:49 ` Daniel Walker
2010-10-18 23:09 ` Daniel Walker
2010-10-18 23:32 ` Nicolas Pitre
2010-10-18 23:45 ` Daniel Walker
2010-10-19 2:47 ` Nicolas Pitre
2010-10-19 16:55 ` Daniel Walker
2010-10-18 20:19 ` Daniel Walker
2010-10-18 20:57 ` Nicolas Pitre
-- strict thread matches above, loose matches on Subject: below --
2013-07-31 6:08 Stephen Rothwell
2011-01-31 2:14 Stephen Rothwell
2011-01-31 2:14 Stephen Rothwell
2011-02-02 18:29 ` David Brown
2011-02-02 19:43 ` Greg KH
2011-02-02 20:00 ` Russell King
2011-02-02 20:32 ` Greg KH
2011-02-02 20:44 ` Russell King
2011-02-02 21:47 ` Nicolas Pitre
2011-02-02 22:46 ` David Brown
2011-02-02 22:59 ` David Brown
2011-02-03 0:15 ` Nicolas Pitre
2011-02-04 17:17 ` Daniel Walker
2011-02-04 17:42 ` Russell King
2011-02-04 18:02 ` David Brown
2011-02-04 18:10 ` Daniel Walker
2011-02-04 19:40 ` Nicolas Pitre
2011-02-04 20:38 ` David Brown
2010-05-04 1:07 Stephen Rothwell
2010-05-04 16:42 ` Daniel Walker
2010-05-04 21:26 ` Stephen Rothwell
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=1287435928.5588.37.camel@c-dwalke-linux.qualcomm.com \
--to=dwalker@fifo99$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=jeremy.kerr@canonical$(echo .)com \
--cc=johlstei@codeaurora$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nico@fluxnic$(echo .)net \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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