From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steven French <sfrench@us.ibm.com>
Cc: James Morris <jmorris@namei.org>,
"David S. Miller" <davem@davemloft.net>,
David Howells <dhowells@redhat.com>,
linux-kernel@vger.kernel.org
Subject: Re: Resolved merge conflicts in next-creds
Date: Tue, 12 Aug 2008 09:39:11 +1000 [thread overview]
Message-ID: <20080812093911.36bc21d3.sfr@canb.auug.org.au> (raw)
In-Reply-To: <OF680EEF56.1C72E960-ON872574A2.005194A0-862574A2.0051B900@us.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 390 bytes --]
Hi Steve,
On Mon, 11 Aug 2008 09:51:28 -0500 Steven French <sfrench@us.ibm.com> wrote:
>
> These (cifs) changes should be in Linus's mainline now so should be easier
> to merge your patch now.
Yeah, the conflicts were no longer in yesterday's linux-next merge.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
prev parent reply other threads:[~2008-08-11 23:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-10 23:57 James Morris
2008-08-11 0:16 ` Stephen Rothwell
2008-08-11 5:35 ` Stephen Rothwell
2008-08-11 21:53 ` James Morris
2008-08-11 23:36 ` Stephen Rothwell
2008-08-12 9:27 ` David Howells
2008-08-12 11:19 ` Stephen Rothwell
2008-08-11 14:51 ` Steven French
2008-08-11 23:39 ` Stephen Rothwell [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=20080812093911.36bc21d3.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfrench@us.ibm.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 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®