On Sat, Oct 21, 2017 at 1:15 AM, Greg Kroah-Hartman <gre...@linuxfoundation.org> wrote: > On Fri, Oct 20, 2017 at 08:58:58PM -0400, Sherry Yang wrote: >> Use binder_alloc struct's mm_struct rather than getting >> a reference to the mm struct through get_task_mm to >> avoid a potential deadlock between lru lock, task lock and >> dentry lock, since a thread can be holding the task lock >> and the dentry lock while trying to acquire the lru lock. >> >> Acked-by: Arve Hjønnevåg <a...@android.com> >> Signed-off-by: Sherry Yang <sher...@android.com> >> --- >> drivers/android/binder_alloc.c | 22 +++++++++------------- >> drivers/android/binder_alloc.h | 1 - >> 2 files changed, 9 insertions(+), 14 deletions(-) > > I've applied these first 2 patches, but patches 3 and 4 I have already > applied to my char-misc-next tree, right? > > thanks, > > greg k-h
I would expect you got a merge conflict from one of those. Using patch 3 and 4 in from this patchset should avoid that conflict if your eventual 4.15 branch is not based on your current char-misc-next branch. -- Arve Hjønnevåg
