Several cases of bug fixes in 'net' overlapping other changes in
'net-next-.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>