[-- Attachment #1: Type: text/plain, Size: 575 bytes --] 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. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #1: Type: text/plain, Size: 448 bytes --] On Mon, Sep 16, 2019 at 02:22:53AM +0100, Mark Brown wrote: > 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. Sorry, I didn't actually get that done today as I had no time when the conflict came up so I continue to carry the old version of the tree. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --]