linux-kernel - Re: [GIT PULL] Kbuild updates for v5.17-rc1

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHk-=wiizVi7p_VbaXgKxSne9fAEqNR8F_ivx95_2mkGOxxPqg@mail.gmail.com>
Date:   Wed, 19 Jan 2022 11:20:06 +0200
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Masahiro Yamada <masahiroy@...nel.org>
Cc:     Linux Kbuild mailing list <linux-kbuild@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] Kbuild updates for v5.17-rc1

On Tue, Jan 18, 2022 at 9:43 PM Masahiro Yamada <masahiroy@...nel.org> wrote:
>
> You will see a trivial conflict in scripts/link-vmlinux.sh
> (commit 72b3942a173c in the mainline
> vs 7d153696e5db from this PR)
> The fix is available in linux-next.

The resolution in linux-next seems to be wrong.

It missed a new case of

        if [ -n "${CONFIG_SLS}" ]; then

in scripts/link-vmlinux.sh, which no longer works after commit
7d153696e5db ("kbuild: do not include include/config/auto.conf from
shell scripts").

That needed to be converted to

        if is_enabled CONFIG_SLS; then

too.

I think that was the only case. Knock wood.

             Linus