From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Russell King <rmk@arm.linux.org.uk>, <linux-next@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, Jon Medhurst <tixy@yxit.co.uk>
Subject: Re: linux-next: manual merge of the moduleh tree with the arm tree
Date: Fri, 26 Aug 2011 09:11:50 +1000 [thread overview]
Message-ID: <20110826091150.58697ca3adc9ba6dfcb357e0@canb.auug.org.au> (raw)
In-Reply-To: <4E56CF76.70201@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 704 bytes --]
Hi Paul,
On Thu, 25 Aug 2011 18:40:54 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> OK. I was entertaining feeding some of the really obvious and simple
> parts of the moduleh branch out to the various maintainers just to
> reduce its overall size, but in the end I guess that just makes work
> for me and them -- vs. a single pull request to Linus for addition to
> v3.2-rc1. I'll just stay the course and Stephen will have to rerere
> the merge conflict resolution for a while -- something I'm certain
> that he has automated long long ago.
Yeah, that's fine.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2011-08-25 23:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-25 5:17 Stephen Rothwell
2011-08-25 16:33 ` Paul Gortmaker
2011-08-25 16:39 ` Russell King
2011-08-25 22:40 ` Paul Gortmaker
2011-08-25 23:11 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-11 5:02 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=20110826091150.58697ca3adc9ba6dfcb357e0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=rmk@arm.linux.org.uk \
--cc=tixy@yxit.co.uk \
/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
all inboxes | Powered by JetHome®