Subject: Re: linux-next: manual merge of the akpm tree with the kselftest-fixes tree

From: Shuah Khan <[email-masked]>
Date: Tue, 6 Oct 2020 12:55:30 -0600

On 10/6/20 5:07 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the akpm tree got a conflict in:
> 
>    tools/testing/selftests/vm/gup_test.c
> 
> between commit:
> 
>    aa803771a80a ("tools: Avoid comma separated statements")
> 
> from the kselftest-fixes tree and commit:
> 
>    5c64830675a6 ("mm/gup_benchmark: rename to mm/gup_test")
> 
> from the akpm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 

Hi Stephen,

Thanks for fixing it. I will mention it in my pull request to Linus

thanks,
-- Shuah