linux-next: manual merge of the nfs tree

linux-next: manual merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 437 bytes --]

Hi Trond,

Today's linux-next merge of the nfs tree got a conflict in
net/sunrpc/rpcb_clnt.c between commit
0d3a34b48c87a374b37d7a21a60d257d076484f3 ("SUNRPC: Fix a double-free in
rpcbind") from Linus' tree (which is in nfs tree as well) and some commit
(s) from the nfs tree.

I just used the version from the nfs tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the nfs tree

[Trond Myklebust]

On Wed, 2008-07-09 at 12:56 +1000, Stephen Rothwell wrote:
> Hi Trond,
> 
> Today's linux-next merge of the nfs tree got a conflict in
> net/sunrpc/rpcb_clnt.c between commit
> 0d3a34b48c87a374b37d7a21a60d257d076484f3 ("SUNRPC: Fix a double-free in
> rpcbind") from Linus' tree (which is in nfs tree as well) and some commit
> (s) from the nfs tree.
> 
> I just used the version from the nfs tree.

Hi Stephen,

Sorry about that: I cherry-picked those patches from my 'devel' branch.
I should probably have used some other method.

Anyhow, the nfs tree has now been rebased onto today's mainline kernel,
and so the conflict should now be eliminated.

Cheers
  Trond

Re: linux-next: manual merge of the nfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 673 bytes --]

Hi Trond,

On Wed, 09 Jul 2008 12:44:33 -0400 Trond Myklebust <trond.myklebust@fys.uio.no> wrote:
>
> Sorry about that: I cherry-picked those patches from my 'devel' branch.
> I should probably have used some other method.

Its not really a problem.  Since the patch is the same in both trees and
only one tree further modifies the code, I just take that.  This will
happen occasionally as fixes go into Linus' tree.

> Anyhow, the nfs tree has now been rebased onto today's mainline kernel,
> and so the conflict should now be eliminated.

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 --]