linux-kernel - Re: (subset) linux-next: build failure after merge of the pwm 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 for Android: free password hash cracker in your pocket

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

Date: Tue, 2 Jan 2024 11:47:58 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Lee Jones <lee@...nel.org>
Cc: Thierry Reding <thierry.reding@...il.com>, Sean Young <sean@...s.org>,
 Flavio Suligoi <f.suligoi@...m.it>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: Re: (subset) linux-next: build failure after merge of the pwm tree

Hi Lee,

On Fri, 22 Dec 2023 12:27:58 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> On Thu, 21 Dec 2023 19:34:57 +0100 Thierry Reding <thierry.reding@...il.com> wrote:
> >
> > On Thu, Dec 21, 2023 at 12:58:01PM +0000, Lee Jones wrote:  
> > > On Thu, 21 Dec 2023, Lee Jones wrote:
> > >     
> > > > On Thu, 21 Dec 2023 16:58:05 +1100, Stephen Rothwell wrote:    
> > > > > After merging the backlight tree, today's linux-next build (x86_64
> > > > > allmodconfig) failed like this:
> > > > > 
> > > > > drivers/video/backlight/mp3309c.c: In function 'mp3309c_bl_update_status':
> > > > > drivers/video/backlight/mp3309c.c:134:23: error: implicit declaration of function 'pwm_apply_state'; did you mean 'pwm_apply_args'? [-Werror=implicit-function-declaration]
> > > > >   134 |                 ret = pwm_apply_state(chip->pwmd, &pwmstate);
> > > > >       |                       ^~~~~~~~~~~~~~~
> > > > >       |                       pwm_apply_args
> > > > > 
> > > > > [...]    
> > > > 
> > > > Applied, thanks!
> > > > 
> > > > [1/1] linux-next: build failure after merge of the pwm tree
> > > >       commit: f7baa9ccef93ba1c36a8ecf58c2f4e86fb3181b9    
> > > 
> > > Actually it's:
> > > 
> > >   f7baa9ccef93b ("backlight: mp3309c: Rename  pwm_apply_state() to pwm_apply_might_sleep()")
> > > 
> > > But don't bank on the commit ID staying the same.    
> > 
> > This is likely going to break the build on your branch because
> > pwm_apply_might_sleep() is only available in the PWM tree right now. In  
> 
> And break it did (since I merge the backlight tree before the pwm
> tree), so I used the backlight tree from 20231221.

Please remove that merge fix patch from your tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped