> I don't know how to proceed with this fix. Squashing into the broken
> commit is out of the game as the commit is on a stable branch that is
> already merged in a few trees. Maybe let it go in via the i2c tree?

I think it would be simplest if I put it on top of my for-next branch.
The other option is that PPC pulls the immutable branch

git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/make_remove_callback_void-immutable

and then applies this patch on top. I don't mind.