Merge tag 'powerpc-5.2-6' into fixes