All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>