Hi Andrew, On Tue, 18 Aug 2015 18:44:48 +1000 Stephen Rothwell <[email protected]> wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > mm/Kconfig
Also mm/Makefile -- Cheers, Stephen Rothwell [email protected] -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
