linux-kernel - Re: linux-next: build failure after merge of the thermal 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]

Message-ID: <20180608110715.29081e25@canb.auug.org.au>
Date:   Fri, 8 Jun 2018 11:07:15 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Zhang Rui <rui.zhang@...el.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kees Cook <keescook@...omium.org>,
        Bjorn Andersson <bjorn.andersson@...aro.org>,
        Eduardo Valentin <edubezval@...il.com>,
        Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: linux-next: build failure after merge of the thermal tree

Hi all,

On Fri, 8 Jun 2018 10:51:20 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> After merging the thermal tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/thermal/qcom/tsens.c: In function 'tsens_probe':
> drivers/thermal/qcom/tsens.c:144:31: error: 's' undeclared (first use in this function)
>          num_sensors * sizeof(*s), GFP_KERNEL);
>                                ^
> 
> Caused by commit
> 
>   6d7c70d1cd65 ("thermal: qcom: tsens: Allow number of sensors to come from DT")
> 
> interacting with commit
> 
>   0ed2dd03b94b ("treewide: Use struct_size() for devm_kmalloc() and friends")
> 
> from Linus' tree.  It looks like git somehow screwed up the automatic
> conflict resolution.

OK, this was caused by a bad rerere entry in my tree (from my recent import of Andrew's mmotm patch series).  Sorry about that, I have fixed it up.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped