2018-03-21 00:13:36

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: please clean up the nfs-anna tree

Hi all,

It only seems to contain commits that have been upsreamed as different
commits and is causing conflicts:

CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/transport.c
CONFLICT (content): Merge conflict in net/sunrpc/xprt.c

--
Cheers,
Stephen Rothwell

Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2018-03-21 19:48:58

by Anna Schumaker

[permalink] [raw]
Subject: Re: linux-next: please clean up the nfs-anna tree



On 03/20/2018 08:11 PM, Stephen Rothwell wrote:
> Hi all,
>
> It only seems to contain commits that have been upsreamed as different
> commits and is causing conflicts:
>
> CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/transport.c
> CONFLICT (content): Merge conflict in net/sunrpc/xprt.c

Sorry about that! I've updated the tree, and added in patches for 4.17 while I was at it

Anna
>