> Applied to for-next with Andrew's Rev-by from v3 added, thanks!

And I needed to rebase it to i2c/for-mergewindow because of the
remove-callback rework.