diff options
| author | Jakub Kicinski <[email protected]> | 2022-12-01 23:36:27 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2022-12-01 23:36:27 +0000 |
| commit | 19833ae2703d4b5ca184db50a11351cfa611da01 (patch) | |
| tree | 891b142600f0367a9a003ceb64059bbcbaf42aa5 /net/ipv4/tcp_ipv4.c | |
| parent | r8169: use tp_to_dev instead of open code (diff) | |
| parent | jump_label: Use atomic_try_cmpxchg() in static_key_slow_inc_cpuslocked() (diff) | |
| download | kernel-19833ae2703d4b5ca184db50a11351cfa611da01.tar.gz kernel-19833ae2703d4b5ca184db50a11351cfa611da01.zip | |
Merge branch 'locking/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull in locking/core from tip (just a single patch) to avoid a conflict
with a jump_label change needed by a TCP cleanup.
Link: https://lore.kernel.org/all/[email protected]/
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
0 files changed, 0 insertions, 0 deletions