The only slightly tricky merge conflict was the netdevsim because the
mutex locking fix overlapped a lot of driver reload reorganization.

The rest were (relatively) trivial in nature.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>