lkml.org 
[lkml]   [2019]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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.
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2019-09-16 03:24    [W:0.025 / U:1.332 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site