Merge 5.4-rc5 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 27 Oct 2019 17:48:33 +0000 (18:48 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 27 Oct 2019 17:48:33 +0000 (18:48 +0100)
commitda80d2e516eb858eb5bcca7fa5f5a13ed86930e4
tree98b4884ed60861b5698ca770449b7484a7c8ae57
parent6859eba4f6fbc515ea05f53b77ec55f49a6dcf0f
parentd6d5df1db6e9d7f8f76d2911707f7d5877251b02
Merge 5.4-rc5 into char-misc-next

We want the binder fix in here as well for testing and to work on top
of.

Also handles a merge issue in binder.c to help linux-next out

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/android/binder.c
drivers/android/binder_alloc.c