From: Kyle McMartin <kyle@mcmartin.ca>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kyle McMartin <kyle@mcmartin.ca>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>,
James Morris <jmorris@namei.org>,
linux-parisc@vger.kernel.org
Subject: Re: linux-next: manual merge of the security-testing tree with the parisc tree
Date: Mon, 14 Sep 2009 09:49:27 -0400 [thread overview]
Message-ID: <20090914134927.GF19494@bombadil.infradead.org> (raw)
In-Reply-To: <20090914153532.2c06eeae.sfr@canb.auug.org.au>
On Mon, Sep 14, 2009 at 03:35:32PM +1000, Stephen Rothwell wrote:
> Hi Kyle,
> > Overlapping changes. I fixed it up (using the parisc versions and adding
> > the extra change from the latter security-testing patch) and can carry
> > the fixes as necessary.
>
> This conflict is now between the parisc tree and Linus' tree ...
>
You don't say.
prev parent reply other threads:[~2009-09-14 13:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-03 5:46 linux-next: manual merge of the security-testing tree with the parisc tree Stephen Rothwell
2009-09-14 5:35 ` Stephen Rothwell
2009-09-14 13:49 ` Kyle McMartin [this message]
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=20090914134927.GF19494@bombadil.infradead.org \
--to=kyle@mcmartin.ca \
--cc=dhowells@redhat.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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