linux-next: build failure after merge of the net-next tree

Hi all,

[A report from Mark's buildbot]

After merging the net-next tree, today's linux-next build (arm allmodconfig) failed like thisi (this has actually been failing for a few days, now):

ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!

Caused by commit

49425dfc7451 ("ixgbe: Add support for x550em_a 10G MAC type")

arm only allows udelay()s up to 2 milliseconds. This commit adds a 5 ms udelay in ixgbe_acquire_swfw_sync_x550em_a() in drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c.