From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Shuah Khan <shuah@kernel•org>, Andrew Morton <akpm@linux-foundation•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mark Brown <broonie@kernel•org>,
Shuah Khan <skhan@linuxfoundation•org>,
Tiezhu Yang <yangtiezhu@loongson•cn>
Subject: linux-next: manual merge of the kselftest tree with the mm-hotfixes tree
Date: Thu, 19 Oct 2023 16:33:10 +1100 [thread overview]
Message-ID: <20231019163310.6c24d6ac@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 801 bytes --]
Hi all,
Today's linux-next merge of the kselftest tree got a conflict in:
tools/testing/selftests/clone3/clone3.c
between commit:
fc7f04dc23db ("selftests/clone3: Fix broken test under !CONFIG_TIME_NS")
from the mm-hotfixes tree and commit:
34dce23f7e40 ("selftests/clone3: Report descriptive test names")
from the kselftest tree.
I fixed it up (I used this files form the latter commit) 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:[~2023-10-19 5:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-19 5:33 Stephen Rothwell [this message]
2023-10-19 14:49 ` linux-next: manual merge of the kselftest tree with the mm-hotfixes tree Shuah Khan
2023-10-19 15:36 ` Mark Brown
2023-11-02 22:21 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-08-23 4:52 Stephen Rothwell
2023-08-23 22:43 ` 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=20231019163310.6c24d6ac@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=shuah@kernel$(echo .)org \
--cc=skhan@linuxfoundation$(echo .)org \
--cc=yangtiezhu@loongson$(echo .)cn \
/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