commit | d31e95585ca697fb31440c6fe30113adc85ecfbd | [log] [tgz] |
---|---|---|
author | David S. Miller <davem@davemloft.net> | Sat Nov 02 13:12:51 2019 -0700 |
committer | David S. Miller <davem@davemloft.net> | Sat Nov 02 13:54:56 2019 -0700 |
tree | 4936ea0aaa6b2aeeee4db51e3c60d938c9b9ed96 | |
parent | c23fcbbc6aa4e0bb615e8a7f23e1f32aec235a1c [diff] | |
parent | 1204c70d9dcba31164f78ad5d8c88c42335d51f8 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 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: David S. Miller <davem@davemloft.net>