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

2019-09-16 Thread Mark Brown
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 to

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

2019-09-15 Thread Mark Brown
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