linux-kernel - Re: [git pull] vfs pile 3

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+55aFxLUVB5x0Sd8n8L45G7jOGotkRL7a_CtzP=SxE9CB27Yg@mail.gmail.com>
Date:	Sun, 7 Aug 2016 10:00:29 -0400
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Al Viro <viro@...iv.linux.org.uk>
Cc:	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	linux-fsdevel <linux-fsdevel@...r.kernel.org>
Subject: Re: [git pull] vfs pile 3

On Sat, Aug 6, 2016 at 11:46 PM, Al Viro <viro@...iv.linux.org.uk> wrote:
>
> I went for the second variant (backmerge), but if you prefer the third one,
> just pull #for-linus-2 and I'll send a separate pull request for the last
> commit.  Or just cherry-pick that last commit from #for-linus after having
> pulled #for-linus-2.

Please don't do back-merges to avoid conflicts. I'd *much* rather just
get the conflict. Especially when it's that trivial.

           Linus