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

On 10/14/20 11:38 PM, Stephen Rothwell wrote: Hi all, On Mon, 12 Oct 2020 19:56:49 +1100 Stephen Rothwell wrote: Today's linux-next merge of the akpm-current tree got a conflict in: lib/kunit/test.c between commit: 45dcbb6f5ef7 ("kunit: test: add test plan to KUnit TAP format") fro

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

Hi all, On Mon, 12 Oct 2020 19:56:49 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > lib/kunit/test.c > > between commit: > > 45dcbb6f5ef7 ("kunit: test: add test plan to KUnit TAP format") > > from the kunit-next tree and commit

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

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: lib/kunit/test.c between commit: 45dcbb6f5ef7 ("kunit: test: add test plan to KUnit TAP format") from the kunit-next tree and commit: e685acc91080 ("KUnit: KASAN Integration") from the akpm-current tree. I fi