From: Shuah Khan <skhan@linuxfoundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
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: Re: linux-next: manual merge of the kselftest tree with the mm-hotfixes tree
Date: Wed, 23 Aug 2023 16:43:12 -0600 [thread overview]
Message-ID: <825fafaa-e332-4657-082d-1325b5b2c4a9@linuxfoundation.org> (raw)
In-Reply-To: <20230823145258.6fb2b8d8@canb.auug.org.au>
On 8/22/23 22:52, Stephen Rothwell wrote:
> 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.
>
Thank you Stephen.
Andrew, I will drop the following from kselftest next.
13eb52f6293d ("selftests: cachestat: test for cachestat availability")
thanks,
-- Shuah
next prev parent reply other threads:[~2023-08-23 22:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-23 4:52 linux-next: manual merge of the kselftest tree with the mm-hotfixes tree Stephen Rothwell
2023-08-23 22:43 ` Shuah Khan [this message]
-- 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=825fafaa-e332-4657-082d-1325b5b2c4a9@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=andre.przywara@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=shuah@kernel.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