| commit | a06ee256e5d6f03fffbd088de9bf84035658cc5a | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Sep 25 10:35:29 2018 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Tue Sep 25 10:35:29 2018 -0700 |
| tree | 9b88044cd4a46496d15a05b43246810c8b677f46 | |
| parent | bd6207202db8974ca3d3183ca0d5611d45b2973c [diff] | |
| parent | 846e8dd47c264e0b359afed28ea88e0acdee6818 [diff] |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net Version bump conflict in batman-adv, take what's in net-next. iavf conflict, adjustment of netdev_ops in net-next conflicting with poll controller method removal in net. Signed-off-by: David S. Miller <davem@davemloft.net>