From: Stephen Rothwell <sfr@canb•auug.org.au>
To: 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>,
Shuah Khan <skhan@linuxfoundation•org>,
Sidhartha Kumar <sidhartha.kumar@oracle•com>,
Suren Baghdasaryan <surenb@google•com>
Subject: linux-next: manual merge of the kselftest-fixes tree with Linus' tree
Date: Fri, 27 May 2022 09:33:54 +1000 [thread overview]
Message-ID: <20220527093354.27316445@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 909 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-05-26 23:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-26 23:33 Stephen Rothwell [this message]
2022-05-27 14:28 ` linux-next: manual merge of the kselftest-fixes tree with Linus' tree Shuah Khan
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=20220527093354.27316445@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--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=shuah@kernel$(echo .)org \
--cc=sidhartha.kumar@oracle$(echo .)com \
--cc=skhan@linuxfoundation$(echo .)org \
--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