LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: please clean up the nfs-anna tree
@ 2018-03-21  0:11 Stephen Rothwell
  2018-03-21 19:36 ` Anna Schumaker
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2018-03-21  0:11 UTC (permalink / raw)
  To: Anna Schumaker, Trond Myklebust, NFS Mailing List
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

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

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: please clean up the nfs-anna tree
  2018-03-21  0:11 linux-next: please clean up the nfs-anna tree Stephen Rothwell
@ 2018-03-21 19:36 ` Anna Schumaker
  0 siblings, 0 replies; 2+ messages in thread
From: Anna Schumaker @ 2018-03-21 19:36 UTC (permalink / raw)
  To: Stephen Rothwell, Trond Myklebust, NFS Mailing List
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List



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
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-03-21 19:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-21  0:11 linux-next: please clean up the nfs-anna tree Stephen Rothwell
2018-03-21 19:36 ` Anna Schumaker

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).