Received-SPF: pass (google.com: domain of linux-kernel+bounces-16157-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Thu, 4 Jan 2024 11:55:11 +1100
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
Message-ID: <20240104115511.65770ced@canb.auug.org.au>
In-Reply-To: <20240102114758.14f2e488@canb.auug.org.au>
References: <20231221165805.0c4771c1@canb.auug.org.au>
	<170316329164.542553.8341559295114557258.b4-ty@kernel.org>
	<20231221125801.GG10102@google.com>
	<ZYSFUZf8NcK5vvLv@orome.fritz.box>
	<20231222122758.24f26379@canb.auug.org.au>
	<20240102114758.14f2e488@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/j2je5gp9YNlKaM0mZHHKebX";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/j2je5gp9YNlKaM0mZHHKebX
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Tue, 2 Jan 2024 11:47:58 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>=20
> 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: =20
> > >
> > > On Thu, Dec 21, 2023 at 12:58:01PM +0000, Lee Jones wrote:   =20
> > > > On Thu, 21 Dec 2023, Lee Jones wrote:
> > > >      =20
> > > > > On Thu, 21 Dec 2023 16:58:05 +1100, Stephen Rothwell wrote:     =
=20
> > > > > > After merging the backlight tree, today's linux-next build (x86=
_64
> > > > > > allmodconfig) failed like this:
> > > > > >=20
> > > > > > drivers/video/backlight/mp3309c.c: In function 'mp3309c_bl_upda=
te_status':
> > > > > > drivers/video/backlight/mp3309c.c:134:23: error: implicit decla=
ration of function 'pwm_apply_state'; did you mean 'pwm_apply_args'? [-Werr=
or=3Dimplicit-function-declaration]
> > > > > >   134 |                 ret =3D pwm_apply_state(chip->pwmd, &pw=
mstate);
> > > > > >       |                       ^~~~~~~~~~~~~~~
> > > > > >       |                       pwm_apply_args
> > > > > >=20
> > > > > > [...]     =20
> > > > >=20
> > > > > Applied, thanks!
> > > > >=20
> > > > > [1/1] linux-next: build failure after merge of the pwm tree
> > > > >       commit: f7baa9ccef93ba1c36a8ecf58c2f4e86fb3181b9     =20
> > > >=20
> > > > Actually it's:
> > > >=20
> > > >   f7baa9ccef93b ("backlight: mp3309c: Rename  pwm_apply_state() to =
pwm_apply_might_sleep()")
> > > >=20
> > > > But don't bank on the commit ID staying the same.     =20
> > >=20
> > > 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   =20
> >=20
> > And break it did (since I merge the backlight tree before the pwm
> > tree), so I used the backlight tree from 20231221. =20
>=20
> Please remove that merge fix patch from your tree.

The build of the backlight tree is still failing.

--=20
Cheers,
Stephen Rothwell

--Sig_/j2je5gp9YNlKaM0mZHHKebX
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWWAe8ACgkQAVBC80lX
0GykxQf/dKZ6HXIvwX2yVdpKay/eT86aK8Ly7Vh1ew2AgvtfF7rAjrEOjms2OXsM
dYhzeGDrBA6+pbgEmsyHxIRGkL75OCkGB2pOYgxEmcQ4hR2wviNmPs/zKkgAdggw
Kdv1GDMb8BFFFWp8T0ohyTFTAGNapvuNd6IddvbTmC0k9ywrFJu9hMDo+1qmkA+1
YV+zmEMHqVDQEPKZQ0iM4I5l3F8ma3jgNQUCRROaaCWUAuF5tbHI/Ii3GRFjID3v
3T2JZQaMOgWauj6FUI9l6H1bvHPs+NMdGood/acGR08y+MbF+l2UZjU6LIImUVFk
WykdqlLOaAX7kjIVL64AbZTIqeCV6Q==
=JcHB
-----END PGP SIGNATURE-----

--Sig_/j2je5gp9YNlKaM0mZHHKebX--