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.
signature.asc
Description: PGP signature
