Mainline had UFO fixes, but UFO is removed in net-next so we
take the HEAD hunks.

Minor context conflict in bcmsysport statistics bug fix.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>