diff options
| author | David S. Miller <davem@davemloft.net> | 2019-09-02 20:20:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-02 20:20:17 +0200 |
| commit | 765b7590c92d849806e9a27ab3a5a17cfc6a47a9 (patch) | |
| tree | 4387f5034f870accfd2bb56997c535159da45f06 /net/sctp/objcnt.c | |
| parent | Merge branch 'net-dsa-mv88e6xxx-centralize-SERDES-IRQ-handling' (diff) | |
| parent | Linux 5.3-rc7 (diff) | |
| download | linux-765b7590c92d849806e9a27ab3a5a17cfc6a47a9.tar.xz linux-765b7590c92d849806e9a27ab3a5a17cfc6a47a9.zip | |
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>
Diffstat (limited to 'net/sctp/objcnt.c')
0 files changed, 0 insertions, 0 deletions