summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2020-09-29 18:16:09 -0700
committerDavid S. Miller <davem@davemloft.net>2020-09-29 18:16:09 -0700
commit2b3e981a94d876ae4f05db28b9ac6a85a80c7633 (patch)
tree59f8d418675ec25404f4504dbad9b71c8e253b43 /kernel
parent4972c6ccf9a5f25bd0c877683cea5c1dc16669be (diff)
parent1a49b2c2a501467587504e75bd049d43af38b692 (diff)
Merge branch 'mptcp-Fix-for-32-bit-DATA_FIN'
Mat Martineau says: ==================== mptcp: Fix for 32-bit DATA_FIN The main fix is contained in patch 2, and that commit message explains the issue with not properly converting truncated DATA_FIN sequence numbers sent by the peer. With patch 2 adding an unlocked read of msk->ack_seq, patch 1 cleans up access to that data with READ_ONCE/WRITE_ONCE. This does introduce two merge conflicts with net-next, but both have straightforward resolution. Patch 1 modifies a line that got removed in net-next so the modification can be dropped when merging. Patch 2 will require a trivial conflict resolution for a modified function declaration. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions