Re: linux-next: build failure after merge of the pinctrl tree

From: Uwe Kleine-König
Date: Mon Sep 12 2022 - 09:40:21 EST


Hello Linus,

On Fri, Aug 26, 2022 at 03:18:25PM +0200, Linus Walleij wrote:
> On Fri, Aug 26, 2022 at 1:20 PM Wolfram Sang <wsa@xxxxxxxxxxxxx> wrote:
>
> > > How typical, the ideal way to resolve it is if there is an immutable
> > > branch with the basic changes I can pull in from the i2c tree
> >
> > It is already there:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/make_remove_callback_void-immutable
>
> Oh excellent, pulled this in and applied Stephens fixup on top.

Ideally you would have squashed the fixup into the merge commit. With
the history as it is now you introduced a commit (i.e. 1681956cb79c
("Merge branch 'i2c/make_remove_callback_void-immutable' of
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into devel"))
that fails to compile the pinctrl-cy8c95x0 driver. Also a better subject
line than "pinctrl: fixup for "i2c: Make remove callback return void""
would be nice, I would have mentioned 'cy8c95x0' at least. (But this is
mood of course if your tree is already stable or you remerge and
squash.)

> > Uwe (originator of the series) spread this information. Sorry that it
> > did not reach you.
>
> Don't worry about that, there is no perfect process.

This commit touches quite a lot of files and subsystems. In the first
revision I added all affected maintainers and lists. vger refused the
mail because the the headers got too long.

Best regards
Uwe

--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |

Attachment: signature.asc
Description: PGP signature