Merge pull request #4193 from opalci/skiboot-v6.8-26-g99c10192f

skiboot v6.8-26-g99c10192f