Merge pull request #3472 from opalci/skiboot-v6.5-222-gf1234170

skiboot v6.5-222-gf1234170