Re: linux-next: manual merge of the akpm-current tree with the counters tree

Hi all, On Mon, 12 Oct 2020 19:48:21 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > lib/Makefile > > between commit: > > 37a0dbf631f6 ("counters: Introduce counter_atomic* counters") > > from the counters tree and commit: > >

linux-next: manual merge of the akpm-current tree with the counters tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: lib/Makefile between commit: 37a0dbf631f6 ("counters: Introduce counter_atomic* counters") from the counters tree and commit: ed7f5253e189 ("mm/page_alloc.c: fix freeing non-compound pages") from the