Linux v4.9.4

3 files changed, 5 insertions, 49 deletions

diff --git a/ARM-OMAP4-Fix-crashes.patch b/ARM-OMAP4-Fix-crashes.patch
deleted file mode 100644
index 5a4a257e1..000000000
--- a/ARM-OMAP4-Fix-crashes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From patchwork Wed Oct 26 15:17:01 2016
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [3/5] ARM: OMAP4+: Fix bad fallthrough for cpuidle
-From: Tony Lindgren <tony@atomide.com>
-X-Patchwork-Id: 9397501
-Message-Id: <20161026151703.24730-4-tony@atomide.com>
-To: linux-omap@vger.kernel.org
-Cc: Nishanth Menon <nm@ti.com>, Dmitry Lifshitz <lifshitz@compulab.co.il>,
- Dave Gerlach <d-gerlach@ti.com>,
- Enric Balletbo Serra <eballetbo@gmail.com>, 
- "Dr . H . Nikolaus Schaller" <hns@goldelico.com>,
- Pau Pajuel <ppajuel@gmail.com>, Grazvydas Ignotas <notasas@gmail.com>,
- Benoit Cousson <bcousson@baylibre.com>,
- Santosh Shilimkar <ssantosh@kernel.org>,
- Javier Martinez Canillas <javier@dowhile0.org>,
- Robert Nelson <robertcnelson@gmail.com>,
- Marek Belisko <marek@goldelico.com>, linux-arm-kernel@lists.infradead.org
-Date: Wed, 26 Oct 2016 08:17:01 -0700
-
-We don't want to fall through to a bunch of errors for retention
-if PM_OMAP4_CPU_OSWR_DISABLE is not configured for a SoC.
-
-Fixes: 6099dd37c669 ("ARM: OMAP5 / DRA7: Enable CPU RET on suspend")
-Signed-off-by: Tony Lindgren <tony@atomide.com>
----
- arch/arm/mach-omap2/omap-mpuss-lowpower.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
---- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
-+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
-@@ -244,10 +244,9 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state)
- 		save_state = 1;
- 		break;
- 	case PWRDM_POWER_RET:
--		if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE)) {
-+		if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE))
- 			save_state = 0;
--			break;
--		}
-+		break;
- 	default:
- 		/*
- 		 * CPUx CSWR is invalid hardware state. Also CPUx OSWR
diff --git a/kernel.spec b/kernel.spec
index 1aec1e191..3dc3b47f0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 3
+%define stable_update 4
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -512,7 +512,6 @@ Patch426: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch
 
 # Fix OMAP4 (pandaboard)
 Patch427: arm-revert-mmc-omap_hsmmc-Use-dma_request_chan-for-reque.patch
-Patch428: ARM-OMAP4-Fix-crashes.patch
 
 # Not particularly happy we don't yet have a proper upstream resolution this is the right direction
 # https://www.spinics.net/lists/arm-kernel/msg535191.html
@@ -2182,6 +2181,9 @@ fi
 #
 #
 %changelog
+* Mon Jan 16 2017 Laura Abbott <labbott@fedoraproject.org> - 4.9.4-200
+- Linux v4.9.4
+
 * Mon Jan 16 2017 Peter Robinson <pbrobinson@fedoraproject.org>
 - Minor updates for Raspberry Pi 3 support
 - Re-enable /sys/class/gpio/
diff --git a/sources b/sources
index 2df03010c..a60ea42a6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.9.tar.xz) = bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 SHA512 (perf-man-4.9.tar.gz) = d23bb3da1eadd6623fddbf4696948de7675f3dcf57c711a7427dd7ae111394f58d8f42752938bbea7cd219f1e7f6f116fc67a1c74f769711063940a065f37b99
-SHA512 (patch-4.9.3.xz) = ebda3a59a2d61759db2b49d57e7805f24423e786a0401b9e71de800038fa38d5d7740127b7d87fd0c5a8ea2ecfe7c3be2d717afe3166d97e48efa9522063dde3
+SHA512 (patch-4.9.4.xz) = d6a81ef416068a92bfa5a6a6156cfc50e9c4c44ac6343c076551376f0ce5be486147abf7aa1eed48c3f10ef5d97d3880924c56b70ff4b92faae106d994a25e48