PPC: upstream changes for v3.25.20