projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b6c606 d0c0064)
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)
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>

Trivial merge
Domain: System / Kernel;