linux-kernel - Re: [GIT PULL] Please pull NFS client fixes for 4.13

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CA+55aFz9uu+HUVdvy_zWuPmcPymdw8KLpdnPbFvoH5vyW=bQHw@mail.gmail.com>
Date:   Fri, 21 Jul 2017 16:37:38 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Anna Schumaker <Anna.Schumaker@...app.com>
Cc:     Linux NFS Mailing List <linux-nfs@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] Please pull NFS client fixes for 4.13

On Fri, Jul 21, 2017 at 1:34 PM, Anna Schumaker
<Anna.Schumaker@...app.com> 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