From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Lee Jones <lee@kernel•org>
Cc: Thierry Reding <thierry.reding@gmail•com>,
Sean Young <sean@mess•org>, Flavio Suligoi <f.suligoi@asem•it>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: (subset) linux-next: build failure after merge of the pwm tree
Date: Thu, 4 Jan 2024 11:55:11 +1100 [thread overview]
Message-ID: <20240104115511.65770ced@canb.auug.org.au> (raw)
In-Reply-To: <20240102114758.14f2e488@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2003 bytes --]
Hi all,
On Tue, 2 Jan 2024 11:47:58 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> On Fri, 22 Dec 2023 12:27:58 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > On Thu, 21 Dec 2023 19:34:57 +0100 Thierry Reding <thierry.reding@gmail•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.
The build of the backlight tree is still failing.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-01-04 0:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-21 5:58 linux-next: build failure after merge of the pwm tree Stephen Rothwell
2023-12-21 9:25 ` Thierry Reding
2023-12-21 10:09 ` Lee Jones
2023-12-21 12:13 ` Sean Young
2023-12-21 12:51 ` Lee Jones
2023-12-21 12:54 ` (subset) " Lee Jones
2023-12-21 12:58 ` Lee Jones
2023-12-21 18:34 ` Thierry Reding
2023-12-22 1:27 ` Stephen Rothwell
2024-01-02 0:47 ` Stephen Rothwell
2024-01-04 0:55 ` Stephen Rothwell [this message]
2024-01-04 10:02 ` Bagas Sanjaya
2024-01-04 12:50 ` Sean Young
2024-01-04 22:04 ` Stephen Rothwell
2024-01-08 17:15 ` Lee Jones
2024-01-05 2:20 ` Bagas Sanjaya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240104115511.65770ced@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=f.suligoi@asem$(echo .)it \
--cc=lee@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sean@mess$(echo .)org \
--cc=thierry.reding@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox