From: Steven Rostedt <rostedt@goodmis.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the ftrace tree with Linus' tree
Date: Mon, 14 Dec 2020 16:33:57 -0500 [thread overview]
Message-ID: <20201214163357.6413989c@gandalf.local.home> (raw)
In-Reply-To: <20201215073725.42abe121@canb.auug.org.au>
On Tue, 15 Dec 2020 07:37:25 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > + check_buffer(cpu_buffer, info, CHECK_FULL_PAGE);
> > return rb_move_tail(cpu_buffer, tail, info);
> > }
> >
>
> Just a reminder that this conflict still exists.
>
Thanks for the reminder. Both updates were done by me, and I assumed that
the fix was trivial enough for Linus to figure out.
But I'll try to remember to include a note about it before sending to Linus.
Cheers,
-- Steve
next prev parent reply other threads:[~2020-12-14 21:34 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 5:02 linux-next: manual merge of the ftrace tree with Linus' tree Stephen Rothwell
2020-12-14 20:37 ` Stephen Rothwell
2020-12-14 21:33 ` Steven Rostedt [this message]
-- strict thread matches above, loose matches on Subject: below --
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
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=20201214163357.6413989c@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).