linux-kernel - Re: linux-next: manual merge of the ftrace tree with the kselftest-fixes 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <8482e2c8-9ee9-4207-9ad5-b2e66dd38b4a@linuxfoundation.org>
Date:   Wed, 18 Oct 2023 10:01:04 -0600
From:   Shuah Khan <skhan@...uxfoundation.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Steven Rostedt <rostedt@...dmis.org>,
        Masami Hiramatsu <mhiramat@...nel.org>,
        Shuah Khan <shuah@...nel.org>
Cc:     Beau Belgrave <beaub@...ux.microsoft.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 ftrace tree with the
 kselftest-fixes tree

On 10/17/23 19:30, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the ftrace tree got a conflict in:
> 
>    tools/testing/selftests/user_events/abi_test.c
> 
> between commit:
> 
>    cf5a103c98a6 ("selftests/user_events: Fix abi_test for BE archs")
> 
> from the kselftest-fixes tree and commit:
> 
>    cf74c59c4fc1 ("selftests/user_events: Test persist flag cases")
> 
> from the ftrace tree.
> 
> I fixed it up (see below) 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.
> 

Thank you Stephen.

Steve, how would you like to handle this one. I am planning
to send fix to Linus this week to be included in Linux 6.6
in a fixes update.

thanks,
-- Shuah