Subject: Re: linux-next: manual merge of the kselftest tree with the mm-hotfixes tree

From: Shuah Khan <[email-masked]>
Date: Wed, 23 Aug 2023 16:43:12 -0600

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