| commit | 765b7590c92d849806e9a27ab3a5a17cfc6a47a9 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Sep 02 11:20:17 2019 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Mon Sep 02 11:20:17 2019 -0700 |
| tree | 4387f5034f870accfd2bb56997c535159da45f06 | |
| parent | 4bc61b0b16955322576265724ab0a0075a30dc84 [diff] | |
| parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net r8152 conflicts are the NAPI fixes in 'net' overlapping with some tasklet stuff in net-next Signed-off-by: David S. Miller <davem@davemloft.net>