This is new code and not bug fixes.

This reverts all changes added by merge commit
8fb18be9Signed-off-by: NDavid S. Miller <davem@davemloft.net>