From: "J. Bruce Fields" <bfields@fieldses•org>
To: Trond Myklebust <Trond.Myklebust@netapp•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
NeilBrown <neilb@suse•de>
Subject: Re: linux-next: manual merge of the nfsd tree with the nfs tree
Date: Mon, 10 Aug 2009 14:17:56 -0400 [thread overview]
Message-ID: <20090810181756.GB6723@fieldses.org> (raw)
In-Reply-To: <1249927732.21816.5.camel@heimdal.trondhjem.org>
On Mon, Aug 10, 2009 at 02:08:52PM -0400, Trond Myklebust wrote:
> On Mon, 2009-08-10 at 12:05 -0400, J. Bruce Fields wrote:
> > On Mon, Aug 10, 2009 at 10:58:51AM +1000, Stephen Rothwell wrote:
> > > Hi Bruce,
> > >
> > > Today's linux-next merge of the nfsd tree got a conflict in
> > > net/sunrpc/cache.c between commit
> > > 173912a6add00f4715774dcecf9ee53274c5924c ("SUNRPC: Move procfs-specific
> > > stuff out of the generic sunrpc cache code") from the nfs tree and commit
> > > f866a8194f7cbabb9135b98b9ac7d26237b88367 ("sunrpc/cache: rename
> > > queue_loose to cache_dequeue") from the nfsd tree.
> >
> > OK, thanks.
> >
> > Looks like there may be some less trivial conflicts now, though. Trond,
> > maybe you could rebase the cache stuff against my latest for-2.6.32?
>
> I've merged your for-2.6.32 into a dedicated sunrpc_cache-for_next topic
> branch and pushed that out as part of the NFS client linux-next.
Yup, that works for me. Thanks.
Note I'm no longer messing with the for-2.6.x branches (like
for-2.6.32)--so those will only ever fast-forward.
--b.
next prev parent reply other threads:[~2009-08-10 18:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-10 0:58 linux-next: manual merge of the nfsd tree with the nfs tree Stephen Rothwell
2009-08-10 16:05 ` J. Bruce Fields
2009-08-10 18:08 ` Trond Myklebust
2009-08-10 18:17 ` J. Bruce Fields [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-02-10 0:55 Stephen Rothwell
2015-02-10 15:34 ` J. Bruce Fields
2021-10-24 23:59 Stephen Rothwell
2021-10-25 0:10 ` Stephen Rothwell
2025-03-20 22:11 Stephen Rothwell
2025-03-21 13:32 ` Chuck Lever
2025-03-21 13:37 ` Trond Myklebust
2025-03-21 13:40 ` Chuck Lever
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=20090810181756.GB6723@fieldses.org \
--to=bfields@fieldses$(echo .)org \
--cc=Trond.Myklebust@netapp$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=neilb@suse$(echo .)de \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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