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
