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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <825fafaa-e332-4657-082d-1325b5b2c4a9@linuxfoundation.org>
Date:   Wed, 23 Aug 2023 16:43:12 -0600
From:   Shuah Khan <skhan@...uxfoundation.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Shuah Khan <shuah@...nel.org>,
        Andrew Morton <akpm@...ux-foundation.org>
Cc:     Andre Przywara <andre.przywara@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Shuah Khan <skhan@...uxfoundation.org>
Subject: Re: linux-next: manual merge of the kselftest tree with the
 mm-hotfixes tree

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