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 > -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
