From 3fb0936a985d6aa56ce73025572ad06aa5f337e8 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 1 Feb 2015 17:58:02 +0000
Subject: [PATCH] merge revision(s) r49463: [Backport #10814]

	signal.c: SIGBUS by stack overflow on Funtoo

	* signal.c (sigbus): seems that Funtoo Linux also delivers SIGBUS
  at stack overflow.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 signal.c  | 3 ++-
 version.h | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/signal.c b/signal.c
index c858428fa8..346d68d758 100644
--- a/signal.c
+++ b/signal.c
@@ -780,7 +780,8 @@ sigbus(int sig SIGINFO_ARG)
  * and it's delivered as SIGBUS instead of SIGSEGV to userland. It's crazy
  * wrong IMHO. but anyway we have to care it. Sigh.
  */
-#if defined __APPLE__
+    /* Seems Linux also delivers SIGBUS. */
+#if defined __APPLE__ || defined __linux__
     CHECK_STACK_OVERFLOW();
 #endif
     rb_bug("Bus Error" MESSAGE_FAULT_ADDRESS);
diff --git a/version.h b/version.h
index 70a7666bf8..184a96175d 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2015-01-22"
-#define RUBY_PATCHLEVEL 285
+#define RUBY_RELEASE_DATE "2015-02-02"
+#define RUBY_PATCHLEVEL 286
 
 #define RUBY_RELEASE_YEAR 2015
-#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_MONTH 2
+#define RUBY_RELEASE_DAY 2
 
 #include "ruby/version.h"