This was a sync from linux v4.5 up through 56028154caafab34063324916095618b2cd30c73 ('i40e: remove forever unused ID')
This was a sync from linux v4.5 up through 56028154caafab3 406332491609561 8b2cd30c73 ('i40e: remove forever unused ID')