Merge tag 'v4.13-rc2'
Linux 4.13-rc2
Conflicts:
drivers/android/binder.c
Pick changes from upstream commit c4ea41ba ("binder:
use group leader instead of open thread") instead of
AOSP Change-Id: Id693f74b3591f3524a8c6e9508e70f3e5a80c588
("ANDROID: binder: use group leader instead of open thread").
include/linux/mount.h
Trivial merge conflict due to upstream commit 3859a271
("randstruct: Mark various structs for randomization").
Signed-off-by:
Amit Pundir <amit.pundir@linaro.org>
Loading
Please register or sign in to comment