Index: linux-stable/Documentation/sysrq.txt
===================================================================
--- linux-stable.orig/Documentation/sysrq.txt
+++ linux-stable/Documentation/sysrq.txt
@@ -64,7 +64,7 @@ On all - Enable network SysRq by writing
 		echo 0x01020304 >/proc/sys/net/ipv4/icmp_echo_sysrq
 	 Send an ICMP echo request with this pattern plus the particular
 	 SysRq command key. Example:
-	 	# ping -c1 -s57 -p0102030468
+		# ping -c1 -s57 -p0102030468
 	 will trigger the SysRq-H (help) command.
 
 
Index: linux-stable/crypto/api.c
===================================================================
--- linux-stable.orig/crypto/api.c
+++ linux-stable/crypto/api.c
@@ -34,6 +34,13 @@ EXPORT_SYMBOL_GPL(crypto_alg_sem);
 struct srcu_notifier_head crypto_chain;
 EXPORT_SYMBOL_GPL(crypto_chain);
 
+static int __init crypto_api_init(void)
+{
+	srcu_init_notifier_head(&crypto_chain);
+	return 0;
+}
+core_initcall(crypto_api_init);
+
 static inline struct crypto_alg *crypto_alg_get(struct crypto_alg *alg)
 {
 	atomic_inc(&alg->cra_refcnt);
Index: linux-stable/include/trace/events/latency_hist.h
===================================================================
--- linux-stable.orig/include/trace/events/latency_hist.h
+++ linux-stable/include/trace/events/latency_hist.h
@@ -27,4 +27,3 @@ static inline char *getaction(int action
 }
 
 #endif /* _LATENCY_HIST_H */
-
Index: linux-stable/kernel/timer.c
===================================================================
--- linux-stable.orig/kernel/timer.c
+++ linux-stable/kernel/timer.c
@@ -1404,7 +1404,11 @@ unsigned long get_next_timer_interrupt(u
 			base->next_timer = __next_timer_interrupt(base);
 		expires = base->next_timer;
 	}
+#ifdef CONFIG_PREEMPT_RT_FULL
 	rt_spin_unlock(&base->lock);
+#else
+	spin_unlock(&base->lock);
+#endif
 
 	if (time_before_eq(expires, now))
 		return now;
Index: linux-stable/localversion-rt
===================================================================
--- linux-stable.orig/localversion-rt
+++ linux-stable/localversion-rt
@@ -1 +1 @@
--rt1
+-rt2
Index: linux-stable/crypto/Kconfig
===================================================================
--- linux-stable.orig/crypto/Kconfig
+++ linux-stable/crypto/Kconfig
@@ -13,7 +13,7 @@ source "crypto/async_tx/Kconfig"
 # Cryptographic API Configuration
 #
 menuconfig CRYPTO
-	tristate "Cryptographic API"
+	bool "Cryptographic API"
 	help
 	  This option provides the core Cryptographic API.
 
Index: linux-stable/kernel/rcutiny_plugin.h
===================================================================
--- linux-stable.orig/kernel/rcutiny_plugin.h
+++ linux-stable/kernel/rcutiny_plugin.h
@@ -560,7 +560,7 @@ void rcu_read_unlock_special(struct task
 		rcu_preempt_cpu_qs();
 
 	/* Hardware IRQ handlers cannot block. */
-	if (in_irq() || in_serving_softirq()) {
+	if (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_OFFSET)) {
 		local_irq_restore(flags);
 		return;
 	}
