From: Shuah Khan <skhan@linuxfoundation•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Steven Rostedt <rostedt@goodmis•org>,
Masami Hiramatsu <mhiramat@kernel•org>,
Shuah Khan <shuah@kernel•org>
Cc: Beau Belgrave <beaub@linux•microsoft.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 ftrace tree with the kselftest-fixes tree
Date: Wed, 18 Oct 2023 10:01:04 -0600 [thread overview]
Message-ID: <8482e2c8-9ee9-4207-9ad5-b2e66dd38b4a@linuxfoundation.org> (raw)
In-Reply-To: <20231018123014.65073211@canb.auug.org.au>
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
next prev parent reply other threads:[~2023-10-18 16:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-18 1:30 linux-next: manual merge of the ftrace tree with the kselftest-fixes tree Stephen Rothwell
2023-10-18 16:01 ` Shuah Khan [this message]
2023-10-18 16:07 ` Steven Rostedt
2023-10-18 17:54 ` Shuah Khan
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=8482e2c8-9ee9-4207-9ad5-b2e66dd38b4a@linuxfoundation.org \
--to=skhan@linuxfoundation$(echo .)org \
--cc=beaub@linux$(echo .)microsoft.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhiramat@kernel$(echo .)org \
--cc=rostedt@goodmis$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=shuah@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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