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

[Mark Brown]

Hi all,

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

  drivers/android/binder_alloc.c

between commits:

  90ce81d2f4f35 ("binder: make shrinker rely solely on per-VMA lock")
  c8084d338eb95 ("binder: remove mmap_lock fallback")

from the char-misc.current tree and commit:

  fd2bc059ed466 ("binder: rm -f binder.c")

from the char-misc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

(deleted this file too)

Attachment: signature.asc
Description: PGP signature