| commit | c1c8626fcebed467184ffd8de0ab5c9f9d9c3594 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Aug 05 13:04:31 2018 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Sun Aug 05 13:04:31 2018 -0700 |
| tree | 2c661fee934f4a7985e4f8e29cd1ba63a330a5e4 | |
| parent | d89d41556141a527030a15233135ba622ba3350d [diff] | |
| parent | 1ffaddd029c867d134a1dde39f540dcc8c52e274 [diff] |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net Lots of overlapping changes, mostly trivial in nature. The mlxsw conflict was resolving using the example resolution at: https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c Signed-off-by: David S. Miller <davem@davemloft.net>