All of lore.kernel.org
 help / color / mirror / Atom feed
From: "J. Bruce Fields" <bfields@fieldses.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linuxt-next: nfsd strange commit
Date: Wed, 22 Oct 2008 22:55:29 -0400	[thread overview]
Message-ID: <20081023025529.GA11477@fieldses.org> (raw)
In-Reply-To: <20081023093004.b061d357.sfr@canb.auug.org.au>

On Thu, Oct 23, 2008 at 09:30:04AM +1100, Stephen Rothwell wrote:
> Hi Bruce,
> 
> On Tue, 21 Oct 2008 09:20:59 -0400 "J. Bruce Fields" <bfields@fieldses.org> wrote:
> >
> > I've also been acting as a (somewhat inconsistent) locks.c maintainer.
> > 
> > Would it make it any easier if I kept a locks-next branch that you could
> > pull separately?  Or should I try to get that stuff into some other
> > tree?
> 
> A separate branch is possible, but if it is only one or two commits it is
> hardly worth it.  Lets see how it goes.

OK.

> However (I don't mean to pick on you, really :-)) your current tree has a
> merge that says "Merge branch 'for-2.6.29' into for-mm".  I (and Andrew)
> really don't want any 2.6.29 stuff in linux-next until after 2.6.28-rc1 -
> it just muddies the conflicts.  So can you remove that merge for now (its
> only a few days) and I will revert that merge in linux-next today.

Whoops.  OK, hopefully the current nfsd-next is more to your liking....

--b.

      reply	other threads:[~2008-10-23  2:55 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-21  3:13 linuxt-next: nfsd strange commit Stephen Rothwell
2008-10-21 13:20 ` J. Bruce Fields
2008-10-22 22:30   ` Stephen Rothwell
2008-10-23  2:55     ` J. Bruce Fields [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=20081023025529.GA11477@fieldses.org \
    --to=bfields@fieldses.org \
    --cc=akpm@linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.