Received-SPF: pass (google.com: domain of linux-kernel+bounces-13962-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Tue, 2 Jan 2024 11:47:58 +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: <20240102114758.14f2e488@canb.auug.org.au>
In-Reply-To: <20231222122758.24f26379@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>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/YiN8r1F0YBU8VsYyl89__He";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi Lee,

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.c=
om> wrote:
> >
> > 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_update=
_status':
> > > > > drivers/video/backlight/mp3309c.c:134:23: error: implicit declara=
tion of function 'pwm_apply_state'; did you mean 'pwm_apply_args'? [-Werror=
=3Dimplicit-function-declaration]
> > > > >   134 |                 ret =3D pwm_apply_state(chip->pwmd, &pwms=
tate);
> > > > >       |                       ^~~~~~~~~~~~~~~
> > > > >       |                       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 pw=
m_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.

Please remove that merge fix patch from your tree.

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWTXT4ACgkQAVBC80lX
0GzZxAf/U20hEGV0PHZRcvogqHglrwcJVh+07Orc6iDExDqY/PHx8XBKxLJa5PHM
iQ61ugWAREO5j4CBP8V+12edCuyWCIVN+B4K9wdIbeowk1vOv85719hHHw0hr3mx
wOW8UVuTkwra2+EBMlKfpJV1MT0TUS4RVfp+eaFxhZKAaAfYrzW6iQApvQ3dL2EN
57xZI85/Y36FkKnAb/ornTZ3cocAo4jgJdL+OKTnG4U9RGlk3lS5MQ48nnqhIE9u
7ePVw1eSLPEqgNLzBPTonExQOmFYLEtGeabX2x0bFEtjRl/R5F105G4EHf/L5AKD
zcPEs8vOdZG2YRRlCjjrVfgAj2b6+w==
=iG6w
-----END PGP SIGNATURE-----

--Sig_/YiN8r1F0YBU8VsYyl89__He--