On Fri, Jul 21, 2017 at 1:34 PM, Anna Schumaker
<Anna.Schumaker@xxxxxxxxxx> wrote:
>
> gpg claims it was able to sync my key with the keyserver, so hopefully
> you're able to update it now.
I can see the updated key, yes.
However, this:
> Peng Tao (1):
> nfs: add export operations
and probably a couple of other ones too are already in my tree, except
as different commits.
So now I have that twice. It merged fine, but why did that patch get
applied to two different trees?
The one I got from you in this pull request is this one:
00422483ad41 nfs: add export operations
and the one I got in your *previous* pull request is this one:
20fa19027286 nfs: add export operations
so you have screwed up something. That thing already came in through
that nfs-for-4.13-1 branch during the merge window.
I'll let it slide this time, BUT STOP REBASING YOUR BRANCHES!
Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
