From: David Brown <davidb@codeaurora•org>
To: Russell King <rmk@arm•linux.org.uk>
Cc: Daniel Walker <dwalker@codeaurora•org>,
Nicolas Pitre <nico@fluxnic•net>, Greg KH <greg@kroah•com>,
Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, lkml <linux-kernel@vger•kernel.org>,
Stepan Moskovchenko <stepanm@codeaurora•org>,
linux-arm-msm@vger•kernel.org
Subject: Re: linux-next: manual merge of the msm tree with the arm tree
Date: Fri, 04 Feb 2011 10:02:19 -0800 [thread overview]
Message-ID: <8yaei7n1xw4.fsf@huya.qualcomm.com> (raw)
In-Reply-To: <20110204174244.GA7396@flint.arm.linux.org.uk> (Russell King's message of "Fri, 4 Feb 2011 17:42:44 +0000")
On Fri, Feb 04 2011, Russell King wrote:
> I really don't care which - but I'll warn you that keeping changes
> hidden will result in a reduction of patch quality, and much much
> much less testing of those changes. And I won't care at all when you
> complain that MSM's broken because of one of my patches.
>
> Exactly what would you prefer?
I'd like to get a little bit of an idea what you would prefer me to do.
I see two reasonable workflows:
- I make a branch for the files that conflict with other changes in
the ARM tree and submit pull requests to you (Russell) for these
changes. Other MSM-specific changes would be in another tree that
goes to Linus.
- I submit everything via pull requests to you. This would probably
result in one additional request to you, that contained the stuff
that didn't conflict, since it would be nice to resolve the obvious
conflicts earlier.
The later is more work for you, and less for Linus.
Thanks,
David
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
next prev parent reply other threads:[~2011-02-04 18:02 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-31 2:14 linux-next: manual merge of the msm tree with the arm tree 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 [this message]
2011-02-04 18:10 ` Daniel Walker
2011-02-04 19:40 ` Nicolas Pitre
2011-02-04 20:38 ` David Brown
-- strict thread matches above, loose matches on Subject: below --
2013-07-31 6:08 Stephen Rothwell
2011-01-31 2:14 Stephen Rothwell
2010-10-17 23:35 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
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
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=8yaei7n1xw4.fsf@huya.qualcomm.com \
--to=davidb@codeaurora$(echo .)org \
--cc=dwalker@codeaurora$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=linux-arm-msm@vger$(echo .)kernel.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 \
--cc=stepanm@codeaurora$(echo .)org \
/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