diff options
| author | David S. Miller <davem@davemloft.net> | 2020-09-30 03:16:09 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-30 03:16:09 +0200 |
| commit | 2b3e981a94d876ae4f05db28b9ac6a85a80c7633 (patch) | |
| tree | 59f8d418675ec25404f4504dbad9b71c8e253b43 /include/asm-generic/vmlinux.lds.h | |
| parent | Merge branch 'via-rhine-Resume-fix-and-other-maintenance-work' (diff) | |
| parent | mptcp: Handle incoming 32-bit DATA_FIN values (diff) | |
| download | linux-2b3e981a94d876ae4f05db28b9ac6a85a80c7633.tar.xz linux-2b3e981a94d876ae4f05db28b9ac6a85a80c7633.zip | |
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 'include/asm-generic/vmlinux.lds.h')
0 files changed, 0 insertions, 0 deletions