diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-12-01 15:36:27 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-12-01 15:36:27 -0800 |
| commit | 19833ae2703d4b5ca184db50a11351cfa611da01 (patch) | |
| tree | 891b142600f0367a9a003ceb64059bbcbaf42aa5 /kernel/profile.c | |
| parent | 4b6c6065fca123d419afef005a696f51e6590470 (diff) | |
| parent | d0c006402e7941558e5283ae434e2847c7999378 (diff) | |
| download | linux-19833ae2703d4b5ca184db50a11351cfa611da01.tar.bz2 | |
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/Y4B17nBArWS1Iywo@hirez.programming.kicks-ass.net/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'kernel/profile.c')
0 files changed, 0 insertions, 0 deletions