Merge branch 'locking/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
authorJakub Kicinski <kuba@kernel.org>
Thu, 1 Dec 2022 23:36:27 +0000 (15:36 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 1 Dec 2022 23:36:27 +0000 (15:36 -0800)
commit19833ae2703d4b5ca184db50a11351cfa611da01
tree891b142600f0367a9a003ceb64059bbcbaf42aa5
parent4b6c6065fca123d419afef005a696f51e6590470
parentd0c006402e7941558e5283ae434e2847c7999378
Merge branch 'locking/core' of git://git./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>