From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Yinan Liu <yinan@linux.alibaba.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 ftrace tree
Date: Fri, 14 Jan 2022 17:42:14 +1100 [thread overview]
Message-ID: <20220114174214.1fde716e@canb.auug.org.au> (raw)
In-Reply-To: <20220113225048.17d4d9b7@rorschach.local.home>
[-- Attachment #1: Type: text/plain, Size: 891 bytes --]
Hi Steve
On Thu, 13 Jan 2022 22:50:48 -0500 Steven Rostedt <rostedt@goodmis.org> wrote:
>
> On Fri, 14 Jan 2022 14:34:18 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > > Does it fail on anything else?
> >
> > This is the first build I do after merging each tree, so I don't know
> > about others. I may be able to do some testing later today (after
> > linux-next is released).
>
> Could you see if this fixes it? This is a revert of part of the patch.
> Yinan, was there a reason you moved this code?
It is my fault, sorry. I got the merge resolution wrong and managed to
remove both copies of:
info SYSMAP System.map
mksysmap vmlinux System.map
putting it back before
if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then
makes it work!
I am so sorry. I will fix up my merge resolution for Monday.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-01-14 6:42 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-12 0:31 linux-next: build failure after merge of the ftrace tree Stephen Rothwell
2022-01-14 1:02 ` Stephen Rothwell
2022-01-14 1:04 ` Steven Rostedt
2022-01-14 2:16 ` Steven Rostedt
2022-01-14 2:58 ` Stephen Rothwell
2022-01-14 3:02 ` Stephen Rothwell
2022-01-14 3:25 ` Steven Rostedt
2022-01-14 3:34 ` Stephen Rothwell
2022-01-14 3:50 ` Steven Rostedt
2022-01-14 5:12 ` Yinan Liu
2022-01-14 6:42 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-23 2:30 Stephen Rothwell
2023-10-23 3:32 ` Matthew Wilcox
2023-10-23 13:41 ` Steven Rostedt
2023-10-26 1:18 ` Stephen Rothwell
2023-10-26 1:21 ` Steven Rostedt
2021-06-10 8:08 Stephen Rothwell
2021-06-10 8:26 ` Peter Zijlstra
2021-06-10 15:06 ` Steven Rostedt
2021-06-15 6:51 ` Mark-PK Tsai
2020-06-03 7:42 Stephen Rothwell
2020-06-03 15:10 ` Tom Zanussi
2020-06-03 15:22 ` Steven Rostedt
2020-06-03 15:24 ` Tom Zanussi
2020-06-03 15:30 ` Steven Rostedt
2020-06-03 21:49 ` Stephen Rothwell
2014-11-21 7:32 Stephen Rothwell
2014-11-21 10:50 ` Jiri Kosina
2014-11-21 14:20 ` Steven Rostedt
2014-11-21 14:23 ` Jiri Kosina
2014-11-21 14:27 ` Steven Rostedt
2014-11-21 12:43 ` Steven Rostedt
2013-03-01 2:47 Stephen Rothwell
2013-03-01 3:06 ` Steven Rostedt
2013-03-02 2:45 ` Steven Rostedt
2013-03-02 3:42 ` Stephen Rothwell
2013-03-02 3:55 ` Steven Rostedt
2013-03-02 4:17 ` Stephen Rothwell
2013-03-02 4:22 ` Steven Rostedt
2013-03-02 4:55 ` 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=20220114174214.1fde716e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=yinan@linux.alibaba.com \
/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).