lkml.org 
[lkml]   [2022]   [Jan]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [GIT PULL] Kbuild updates for v5.17-rc1
On Tue, Jan 18, 2022 at 9:43 PM Masahiro Yamada <masahiroy@kernel.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

\
 
 \ /
  Last update: 2022-01-19 10:21    [W:0.040 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site