linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Howells <dhowells@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: dhowells@redhat.com, James Morris <jmorris@namei.org>,
	linux-next@vger.kernel.org,
	"J. Bruce Fields" <bfields@citi.umich.edu>
Subject: Re: linux-next: manual merge of the security-testing tree
Date: Tue, 25 Nov 2008 11:04:40 +0000	[thread overview]
Message-ID: <8055.1227611080@redhat.com> (raw)
In-Reply-To: <20081125191137.d5474c9e.sfr@canb.auug.org.au>

Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Today's linux-next merge of the security-testing tree got a conflict in
> fs/nfsd/nfs4recover.c between commit
> e4625eb826de4f6774ee602c442ba23b686bdcc7 ("nfsd: use of unitialized list
> head on error exit in nfs4recover.c") from the nfsd tree and commit
> d84f4f992cbd76e8f39c488cf0c5d123843923b1 ("CRED: Inaugurate COW
> credentials") from the security-testing tree.
> 
> Just a context change. I fixed it up (see below) and can carry the fix as
> necessary.

That looks okay.

  reply	other threads:[~2008-11-25 11:05 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-25  8:11 linux-next: manual merge of the security-testing tree Stephen Rothwell
2008-11-25 11:04 ` David Howells [this message]
2008-11-25 21:49 ` J. Bruce Fields
  -- strict thread matches above, loose matches on Subject: below --
2008-12-09  5:40 Stephen Rothwell
2008-12-09 15:28 ` David Howells
2008-12-02  4:06 Stephen Rothwell
2008-11-20  5:37 Stephen Rothwell
2008-12-31  1:50 ` Stephen Rothwell
2009-01-03 22:55   ` David Howells
2008-11-17  4:44 Stephen Rothwell
2008-11-18  7:55 ` James Morris

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=8055.1227611080@redhat.com \
    --to=dhowells@redhat.com \
    --cc=bfields@citi.umich.edu \
    --cc=jmorris@namei.org \
    --cc=linux-next@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;
as well as URLs for NNTP newsgroup(s).