Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Subject: Re: linux-next: manual merge of the kselftest-fixes tree with Linus'
 tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Shuah Khan <shuah@kernel.org>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        Axel Rasmussen <axelrasmussen@google.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>,
        Suren Baghdasaryan <surenb@google.com>,
        Shuah Khan <skhan@linuxfoundation.org>
References: <20220527093354.27316445@canb.auug.org.au>
From:   Shuah Khan <skhan@linuxfoundation.org>
Message-ID: <abcacac6-0a9a-976f-dd48-a8282075247c@linuxfoundation.org>
Date:   Fri, 27 May 2022 08:28:07 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.8.1
MIME-Version: 1.0
In-Reply-To: <20220527093354.27316445@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 5/26/22 5:33 PM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kselftest-fixes tree got a conflict in:
> 
>    tools/testing/selftests/vm/run_vmtests.sh
> 
> between commits:
> 
>    b67bd551201a ("selftests: vm: refactor run_vmtests.sh to reduce boilerplate")
>    33776141b812 ("selftests: vm: add process_mrelease tests")
> 
> from Linus' tree and commit:
> 
>    e8f0c8965932 ("selftest/vm: add skip support to mremap_test")
> 
> from the kselftest-fixes tree.
> 
> I fixed it up (I used the former version of this file which seems to have
> included the latter) 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.
> 

Stephen,

This is just a bit outdated kselftest-fixes tree problem. I didn't update
it after Andrew sent the fixes in.

I don't have plans to send any pull requests from this kselftest-fixes brach.

We are good. Thank you for keeping the fix-up in next. It will be cleared
up in a week or so.

thanks,
-- Shuah