From: Anna Schumaker <Anna.Schumaker@Netapp•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Trond Myklebust <trond.myklebust@fys•uio.no>,
NFS Mailing List <linux-nfs@vger•kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: please clean up the nfs-anna tree
Date: Wed, 21 Mar 2018 15:36:02 -0400 [thread overview]
Message-ID: <df592a0d-8318-7a7c-386c-07838351524a@Netapp.com> (raw)
In-Reply-To: <20180321111140.618e1e6c@canb.auug.org.au>
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
>
prev parent reply other threads:[~2018-03-21 19:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-21 0:11 linux-next: please clean up the nfs-anna tree Stephen Rothwell
2018-03-21 19:36 ` Anna Schumaker [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=df592a0d-8318-7a7c-386c-07838351524a@Netapp.com \
--to=anna.schumaker@netapp$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-nfs@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=trond.myklebust@fys$(echo .)uio.no \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox