Two cases of overlapping changes, nothing fancy. Signed-off-by: David S. Miller <davem@davemloft.net>