From: Steven Rostedt <rostedt@goodmis•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Masami Hiramatsu <mhiramat@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Petr Pavlu <petr.pavlu@suse•com>
Subject: Re: linux-next: manual merge of the ftrace tree with Linus' tree
Date: Mon, 21 Oct 2024 22:22:36 -0400 [thread overview]
Message-ID: <20241021222236.3670ab79@rorschach.local.home> (raw)
In-Reply-To: <20241021132636.39d409f8@canb.auug.org.au>
On Mon, 21 Oct 2024 13:26:36 +1100
Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the ftrace tree got a conflict in:
>
> kernel/trace/ring_buffer.c
>
> between commit:
>
> 09661f75e75c ("ring-buffer: Fix reader locking when changing the sub buffer order")
>
> from Linus' tree and commit:
>
> 1f1c2bc9d075 ("ring-buffer: Limit time with disabled interrupts in rb_check_pages()")
>
> 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.
>
Thanks, but I screwed up my ring-buffer branch. I have a new one
tested, and I'll be rebasing it today.
-- Steve
next prev parent reply other threads:[~2024-10-22 2:22 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-21 2:26 linux-next: manual merge of the ftrace tree with Linus' tree Stephen Rothwell
2024-10-22 2:22 ` Steven Rostedt [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-08 2:32 Stephen Rothwell
2025-01-08 3:23 ` Steven Rostedt
2024-09-27 1:36 Stephen Rothwell
2024-09-27 18:13 ` Andrii Nakryiko
2024-09-27 18:20 ` Steven Rostedt
2023-08-28 1:59 Stephen Rothwell
2023-04-11 2:46 Stephen Rothwell
2023-04-11 3:01 ` Steven Rostedt
2021-10-28 5:31 Stephen Rothwell
2021-10-28 13:14 ` Steven Rostedt
2021-09-15 0:44 Stephen Rothwell
2021-09-15 0:47 ` Steven Rostedt
2021-02-15 4:03 Stephen Rothwell
2020-12-08 5:02 Stephen Rothwell
2020-12-14 20:37 ` Stephen Rothwell
2020-12-14 21:33 ` Steven Rostedt
2019-05-16 1:05 Stephen Rothwell
2019-05-16 1:53 ` Steven Rostedt
2019-05-16 3:32 ` Stephen Rothwell
2019-05-16 1:00 Stephen Rothwell
2018-08-15 4:04 Stephen Rothwell
2015-11-05 2:51 Stephen Rothwell
2015-11-05 3:20 ` Steven Rostedt
2013-07-10 3:51 Stephen Rothwell
2013-04-22 5:55 Stephen Rothwell
2013-04-09 6:30 Stephen Rothwell
2013-03-18 2:00 Stephen Rothwell
2013-03-18 13:26 ` Steven Rostedt
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=20241021222236.3670ab79@rorschach.local.home \
--to=rostedt@goodmis$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhiramat@kernel$(echo .)org \
--cc=petr.pavlu@suse$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/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