lkml.org 
[lkml]   [2018]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: please clean up the nfs-anna tree
From
Date


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
>

\
 
 \ /
  Last update: 2018-03-21 20:48    [W:0.051 / U:0.168 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site