Several cases of overlapping changes which were for the most
part trivially resolvable.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>