merge revision(s) f367b4ffe739453e87e55f955138b0ce662942b7,31a757a4426f1ac8c479313e01542940386fc2fe,837cbea64b74d464bfbfb10e6c81a8f92c6eee71:

	assert_equal accepts an expected value as the first argument

	---
	 test/psych/test_coder.rb | 30 +++++++++++++++---------------
	 1 file changed, 15 insertions(+), 15 deletions(-)

	Make the test pass with the old libyaml

	I have no idea what result is right, but it fails with libyaml 0.1.7
	(bundled with Ubuntu 18.04) anyway.
	---
	 test/psych/test_coder.rb | 6 +++---
	 1 file changed, 3 insertions(+), 3 deletions(-)

	test/psych/test_coder.rb: Suppress non-parenthesis warnings

	http://rubyci.s3.amazonaws.com/debian9/ruby-master/log/20210518T093002Z.log.html.gz
	```
	/home/chkbuild/chkbuild/tmp/build/20210518T093002Z/ruby/test/psych/test_coder.rb:277: warning: ambiguity between regexp and two divisions: wrap regexp in parentheses or add a space after `/' operator
	```
	---
	 test/psych/test_coder.rb | 6 +++---
	 1 file changed, 3 insertions(+), 3 deletions(-)

1 files changed, 1 insertions, 1 deletions

diff --git a/version.h b/version.h
index 99dfe088e7..1266c847c0 100644
--- a/version.h
+++ b/version.h
@@ -12,7 +12,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 154
+#define RUBY_PATCHLEVEL 155
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 11