All conflicts were trivial overlapping changes, so reasonably
easy to resolve.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>