From: Shuah Khan <skhan@linuxfoundation•org>
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>
Subject: Re: linux-next: manual merge of the kselftest-fixes tree with Linus' tree
Date: Fri, 27 May 2022 08:28:07 -0600 [thread overview]
Message-ID: <abcacac6-0a9a-976f-dd48-a8282075247c@linuxfoundation.org> (raw)
In-Reply-To: <20220527093354.27316445@canb.auug.org.au>
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
prev parent reply other threads:[~2022-05-27 14:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-26 23:33 linux-next: manual merge of the kselftest-fixes tree with Linus' tree Stephen Rothwell
2022-05-27 14:28 ` Shuah Khan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=abcacac6-0a9a-976f-dd48-a8282075247c@linuxfoundation.org \
--to=skhan@linuxfoundation$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=axelrasmussen@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=shuah@kernel$(echo .)org \
--cc=sidhartha.kumar@oracle$(echo .)com \
--cc=surenb@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox