Merge branch 'next-eeh' into next-sriov

Merge in Gavin EEH fixes