Re: linux-next: manual merge of the tip tree with Linus' tree
On Tue, Feb 06, 2018 at 11:54:38AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > include/linux/sched/mm.h > > between commit: > > d70f2a14b72a ("include/linux/sched/mm.h: uninline mmdrop_async(), etc")