Mostly simple cases of overlapping changes (adding code nearby,
a function whose name changes, for example).
Signed-off-by: NDavid S. Miller <davem@davemloft.net>