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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <ebb15a68-0bef-ecb7-c323-2358f72ee183@linuxfoundation.org>
Date:   Tue, 6 Oct 2020 12:55:30 -0600
From:   Shuah Khan <skhan@...uxfoundation.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Shuah Khan <shuah@...nel.org>
Cc:     Joe Perches <joe@...ches.com>, John Hubbard <jhubbard@...dia.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Shuah Khan <skhan@...uxfoundation.org>
Subject: Re: linux-next: manual merge of the akpm tree with the
 kselftest-fixes tree

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