From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Steven Rostedt <rostedt@goodmis•org>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel•org>,
"Gustavo A. R. Silva" <gustavo@embeddedor•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: build failure after merge of the kspp-gustavo tree
Date: Mon, 25 Oct 2021 15:30:29 +1100 [thread overview]
Message-ID: <20211025153029.1e307fcf@canb.auug.org.au> (raw)
In-Reply-To: <20211024224215.018c36cd@gandalf.local.home>
[-- Attachment #1: Type: text/plain, Size: 1440 bytes --]
Hi Steven,
On Sun, 24 Oct 2021 22:42:15 -0400 Steven Rostedt <rostedt@goodmis•org> wrote:
>
> On Sun, 24 Oct 2021 21:11:19 -0500
> "Gustavo A. R. Silva" <gustavoars@kernel•org> wrote:
>
> > On Mon, Oct 25, 2021 at 12:54:46PM +1100, Stephen Rothwell wrote:
> > > > --- a/include/linux/ftrace.h
> > > > +++ b/include/linux/ftrace.h
> > > > @@ -45,6 +45,7 @@ struct ftrace_ops;
> > > > void arch_ftrace_ops_list_func(unsigned long ip, unsigned long parent_ip);
> > > > #else
> > > > # define FTRACE_FORCE_LIST_FUNC 0
> > > > +struct ftrace_regs;
> > > > void arch_ftrace_ops_list_func(unsigned long ip, unsigned long parent_ip,
> > > > struct ftrace_ops *op, struct ftrace_regs *fregs);
> > > > #endif
> > > > --
> > > > 2.33.0
> > >
> > > I am still applying this fix ...
> >
> > I will add this fix to the original patch for my tomorrow's -next tree.
>
> Hmm, I pushed my version to my for-next branch. Do you have this in the
> next tree?
>
> 34cdd18b8d245f3e901e5325 ("tracing: Use linker magic instead of recasting
> ftrace_ops_list_func()")
>
> Which shouldn't need this fix.
Well, that is in your tree today, but (1) doesn't help with the build
failure in Gustavo's tree on its own (i.e. it creates a dependency
between Gustavo's tree and your tree) and (2) now I will get a conflict
between the two trees today. Oh, well.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-10-25 4:30 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 7:15 linux-next: build failure after merge of the kspp-gustavo tree Stephen Rothwell
2021-10-18 17:13 ` Gustavo A. R. Silva
2021-10-25 1:54 ` Stephen Rothwell
2021-10-25 2:11 ` Gustavo A. R. Silva
2021-10-25 2:42 ` Steven Rostedt
2021-10-25 4:30 ` Stephen Rothwell [this message]
2021-10-25 11:35 ` Steven Rostedt
-- strict thread matches above, loose matches on Subject: below --
2023-11-21 2:19 Stephen Rothwell
2023-11-21 16:31 ` Gustavo A. R. Silva
2023-11-21 23:15 ` Stephen Rothwell
2023-11-17 0:33 Stephen Rothwell
2023-11-17 0:39 ` Gustavo A. R. Silva
2021-10-18 8:30 Stephen Rothwell
2021-10-20 16:18 ` Gustavo A. R. Silva
2021-10-20 16:20 ` Kees Cook
2021-10-25 1:55 ` Stephen Rothwell
2021-10-25 19:19 ` Kees Cook
2021-10-25 19:31 ` Gustavo A. R. Silva
2021-10-25 19:34 ` Kees Cook
2021-10-14 23:48 Stephen Rothwell
2021-10-15 0:07 ` Gustavo A. R. Silva
2021-10-15 8:02 ` Stephen Rothwell
2021-09-29 23:59 Stephen Rothwell
2021-09-30 0:11 ` Gustavo A. R. Silva
2020-08-17 23:38 Stephen Rothwell
2020-08-18 0:06 ` Gustavo A. R. Silva
2020-08-17 23:34 Stephen Rothwell
2020-08-17 23:46 ` Gustavo A. R. Silva
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=20211025153029.1e307fcf@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=gustavo@embeddedor$(echo .)com \
--cc=gustavoars@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rostedt@goodmis$(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