merge revision(s) 195e32977f181c8af9233a12cfc2c98e0f7957f6:

	Skip test_udp_server on s390x RHEL 7.1

	It seems like it never succeeds on this CI.
	---
	 test/socket/test_socket.rb | 4 ++++
	 1 file changed, 4 insertions(+)

2 files changed, 5 insertions, 1 deletions

diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
index 7e596f0299..41aba32963 100644
--- a/test/socket/test_socket.rb
+++ b/test/socket/test_socket.rb
@@ -340,6 +340,10 @@ class TestSocket < Test::Unit::TestCase
   end
 
   def test_udp_server
+    # http://rubyci.s3.amazonaws.com/rhel_zlinux/ruby-master/log/20230312T023302Z.fail.html.gz
+    # Errno::EHOSTUNREACH: No route to host - recvmsg(2)
+    omit if 'rhel_zlinux' == ENV['RUBYCI_NICKNAME']
+
     begin
       ifaddrs = Socket.getifaddrs
     rescue NotImplementedError
diff --git a/version.h b/version.h
index d4c5f4203b..dea69f8e29 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 4
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 219
+#define RUBY_PATCHLEVEL 220
 
 #define RUBY_RELEASE_YEAR 2023
 #define RUBY_RELEASE_MONTH 3