The following commit has been merged into the locking/core branch of tip: Commit-ID: 3d5c70329b910ab583673a33e3a615873c5d4115 Gitweb: https://git.kernel.org/tip/3d5c70329b910ab583673a33e3a615873c5d4115 Author: Akira Yokosawa <akiyks@xxxxxxxxx> AuthorDate: Sat, 28 Nov 2020 14:32:15 +09:00 Committer: Paul E. McKenney <paulmck@xxxxxxxxxx> CommitterDate: Mon, 04 Jan 2021 14:40:50 -08:00 tools/memory-model: Fix typo in klitmus7 compatibility table klitmus7 of herdtools7 7.48 or earlier depends on ACCESS_ONCE(), which was removed in Linux v4.15. Fix the obvious typo in the table. Fixes: d075a78a5ab1 ("tools/memory-model/README: Expand dependency of klitmus7") Signed-off-by: Akira Yokosawa <akiyks@xxxxxxxxx> Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxx> --- tools/memory-model/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/memory-model/README b/tools/memory-model/README index 39d08d1..9a84c45 100644 --- a/tools/memory-model/README +++ b/tools/memory-model/README @@ -51,7 +51,7 @@ klitmus7 Compatibility Table ============ ========== target Linux herdtools7 ------------ ---------- - -- 4.18 7.48 -- + -- 4.14 7.48 -- 4.15 -- 4.19 7.49 -- 4.20 -- 5.5 7.54 -- 5.6 -- 7.56 --