| commit | 6b6cbc1471676402565e958674523d06213b82d7 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Apr 15 21:16:30 2017 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Sat Apr 15 21:16:30 2017 -0400 |
| tree | a66d41d276e5eb400e27641f24f34032fe1b9275 | |
| parent | ce07183282975026716107d36fd3f5f93de76668 [diff] | |
| parent | 1bf4b1268e66d9364fc6fd41f906bc01458530ac [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts were simply overlapping changes. In the net/ipv4/route.c case the code had simply moved around a little bit and the same fix was made in both 'net' and 'net-next'. In the net/sched/sch_generic.c case a fix in 'net' happened at the same time that a new argument was added to qdisc_hash_add(). Signed-off-by: David S. Miller <davem@davemloft.net>