linux-kernel - linux-next: manual merge of the char-misc tree with the vfs tree

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

Message-ID: <20190916012252.GS4352@sirena.co.uk>
Date:   Mon, 16 Sep 2019 02:22:53 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>,
        David Howells <dhowells@...hat.com>,
        Christian Brauner <christian@...uner.io>,
        Al Viro <viro@...iv.linux.org.uk>,
        Hridya Valsaraju <hridya@...gle.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: manual merge of the char-misc tree with the vfs tree

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  drivers/android/binderfs.c

between commit:

  e7d8840d4b626 ("vfs: Convert binderfs to use the new mount API")

from the vfs tree and commit:

  f00834518ed31 ("binder: add a mount option to show global stats")

from the char-misc tree.

Since it's very late and it seems useful to try to get a -next out with
the state prior to the merge window opening I've used commit
ec13c78d7b45 from the previous -next build rather than fix this up
sorry, I'll come back to it tomorrow.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)