Hi all,

On Fri, 8 Jun 2018 10:51:20 +1000 Stephen Rothwell <sfr@canb.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