Merge pull request #3999 from opalci/skiboot-v6.7-26-g46d7eafbd

skiboot v6.7-26-g46d7eafbd