OK, thanks. Now I pushed the temporary fix (with the revert) to my stable/for-next branch. Once after the kbuild test passes, Jiri can merge it, and push to TW eventually later. Meanwhile I'm going to ping the upstream about this bug.