I left a merge failure unresolved, noticed by Stephen
Rothwell.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>