]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'clocksource.2021.05.02a' into HEAD
authorPaul E. McKenney <paulmck@kernel.org>
Mon, 3 May 2021 03:33:39 +0000 (20:33 -0700)
committerPaul E. McKenney <paulmck@kernel.org>
Mon, 3 May 2021 03:33:39 +0000 (20:33 -0700)
clocksource.2021.05.02a: Distinguish pure delay from clock skew.

1  2 
Documentation/admin-guide/kernel-parameters.txt
include/linux/mm.h
mm/slab.c
mm/slub.c

Simple merge
diff --cc mm/slab.c
Simple merge
diff --cc mm/slub.c
Simple merge