lkml.org 
[lkml]   [2017]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the akpm tree with the tip tree
Hi Andrew,

Today's linux-next merge of (well, import of) the akpm tree got a
conflict in:

include/linux/sched/mm.h

between commit:

68e21be2916b35 ("sched/headers: Move task->mm handling methods to <linux/sched/mm.h>")

from the tip tree and commit:

d3a5cfa169959b ("include/linux/sched/mm.h: uninline mmdrop_async(), etc")

from the akpm tree.

I don't feel confident fixing this up, I'm trying to figure out how to
drop one of the commits but this script isn't the clearest in it's
intent.
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2017-10-16 20:48    [W:0.022 / U:0.928 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site