Re: (subset) linux-next: build failure after merge of the pwm tree

[Stephen Rothwell]

Hi all,

On Tue, 2 Jan 2024 11:47:58 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 
> On Fri, 22 Dec 2023 12:27:58 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > On Thu, 21 Dec 2023 19:34:57 +0100 Thierry Reding <thierry.reding@xxxxxxxxx> 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.

The build of the backlight tree is still failing.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpik3vfFRZ3Z.pgp
Description: OpenPGP digital signature