diff options
author | David S. Miller <davem@davemloft.net> | 2017-08-10 12:11:16 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-08-10 12:11:16 -0700 |
commit | 3b2b69efeca734b78bc85fd02253b0465bb2bec7 (patch) | |
tree | 57fd8b5b0e9c04f24f5f9ec70ceb0a706cecfb47 /net/sctp/sm_make_chunk.c | |
parent | 2e2d5d767c9ddb2b10d74f2c20a257101c7070eb (diff) | |
parent | 26273939ace935dd7553b31d279eab30b40f7b9a (diff) | |
download | linux-3b2b69efeca734b78bc85fd02253b0465bb2bec7.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Mainline had UFO fixes, but UFO is removed in net-next so we
take the HEAD hunks.
Minor context conflict in bcmsysport statistics bug fix.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/sm_make_chunk.c')
0 files changed, 0 insertions, 0 deletions