Merge the fixes to next as both carry qmp-phy patches
Attach a file by drag & drop or click to upload
