[PATCH AUTOSEL for 4.9 165/281] i40evf: fix merge error in older patch