linux-kernel - Re: linux-next: build failure after merge of the ftrace tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Fri, 14 Jan 2022 17:42:14 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Steven Rostedt <rostedt@...dmis.org>
Cc:     Yinan Liu <yinan@...ux.alibaba.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the ftrace tree

Hi Steve

On Thu, 13 Jan 2022 22:50:48 -0500 Steven Rostedt <rostedt@...dmis.org> wrote:
>
> On Fri, 14 Jan 2022 14:34:18 +1100
> Stephen Rothwell <sfr@...b.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

Content of type "application/pgp-signature" skipped