Merge pull request #2375 from stewart-ibm/v6.1-124-g7dbf80d1db45

skiboot v6.1-124-g7dbf80d1db45