linux-kernel - Re: [git pull] vfs.git

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CA+55aFxcFKxY8f1-mQz68FX3Uax-i-FQ3Wj9=z+bUn0KxTCbHA@mail.gmail.com>
Date:	Fri, 1 Jun 2012 10:38:53 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Al Viro <viro@...iv.linux.org.uk>
Cc:	linux-kernel@...r.kernel.org, linux-fsdevel@...r.kernel.org
Subject: Re: [git pull] vfs.git

On Fri, Jun 1, 2012 at 9:56 AM, Al Viro <viro@...iv.linux.org.uk> wrote:
>
> There's a trivial conflict in Documentation/filesystems/vfs.txt - two
> method prototypes added, one in mainline, one here.  With the obvious
> conflict resolution...

Actually, it's one removed in mainline, one added by your pull.

What I'd *really* like to see is a kind of summary of what this pull
does, though. Please? That way I can make the merge messages be a
whole lot more informative.

            Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/