From: Steven Rostedt <rostedt@goodmis.org>
To: Chuck Lever III <chuck.lever@oracle.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the ftrace tree with the nfsd tree
Date: Tue, 15 Mar 2022 10:15:24 -0400 [thread overview]
Message-ID: <20220315101524.6215285d@gandalf.local.home> (raw)
In-Reply-To: <A1869114-7192-4DF2-BD0F-B2A970F79CC2@oracle.com>
On Tue, 15 Mar 2022 13:33:30 +0000
Chuck Lever III <chuck.lever@oracle.com> wrote:
> > af6b9668e85f ("tracing: Move the defines to create TRACE_EVENTS into their own files")
> >
> > from the ftrace tree.
> >
> > Well, this is a pain :-(
Welcome to the include/trace directory ;-)
>
> Apologies. Steven, can you take the sockaddr patches in your tree
> and resolve the x86_64 build issue?
My apologies, I forgot that there was changes in other trees that affect
this.
Anyway, I'll go and do a merge myself and see what happens. The point of
linux-next is to resolve these kinds of issues. I believe the reason you
took those changes was because you have a dependency on them, and I think
they should stay in your tree.
Let me do the merge myself and verify what Stephen did was correct or needs
to be updated. This will also need to be done for Linus as well.
Thanks,
-- Steve
next prev parent reply other threads:[~2022-03-15 14:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 3:58 linux-next: manual merge of the ftrace tree with the nfsd tree Stephen Rothwell
2022-03-15 13:33 ` Chuck Lever III
2022-03-15 14:15 ` Steven Rostedt [this message]
2022-03-15 17:31 ` Steven Rostedt
2022-03-15 17:33 ` Chuck Lever III
2022-03-16 3:09 ` Stephen Rothwell
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=20220315101524.6215285d@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=chuck.lever@oracle.com \
--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