From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shuah Khan <shuah@kernel.org>, Andrew Morton <akpm@linux-foundation.org>
Cc: Andre Przywara <andre.przywara@arm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Shuah Khan <skhan@linuxfoundation.org>
Subject: linux-next: manual merge of the kselftest tree with the mm-hotfixes tree
Date: Wed, 23 Aug 2023 14:52:58 +1000 [thread overview]
Message-ID: <20230823145258.6fb2b8d8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 907 bytes --]
Hi all,
Today's linux-next merge of the kselftest tree got a conflict in:
tools/testing/selftests/cachestat/test_cachestat.c
between commits:
fbf31ed6e0f4 ("selftests: cachestat: test for cachestat availability")
8d55633e168b ("selftests: cachestat: catch failing fsync test on tmpfs")
from the mm-hotfixes tree and commit:
13eb52f6293d ("selftests: cachestat: test for cachestat availability")
from the kselftest tree.
I fixed it up (I just used the former version of the conflicting bits)
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-08-23 4:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-23 4:52 Stephen Rothwell [this message]
2023-08-23 22:43 ` linux-next: manual merge of the kselftest tree with the mm-hotfixes tree Shuah Khan
-- strict thread matches above, loose matches on Subject: below --
2023-10-19 5:33 Stephen Rothwell
2023-10-19 14:49 ` Shuah Khan
2023-10-19 15:36 ` Mark Brown
2023-11-02 22:21 ` Stephen Rothwell
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=20230823145258.6fb2b8d8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=andre.przywara@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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