Linux v4.7-rc3-87-gbb96727

- enable CONFIG_PWM (rhbz 1347454)

5 files changed, 10 insertions, 37 deletions

diff --git a/KEYS-potential-uninitialized-variable.patch b/KEYS-potential-uninitialized-variable.patch
deleted file mode 100644
index 23cabbb2e..000000000
--- a/KEYS-potential-uninitialized-variable.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 82a50018782f84e733e718d4b24e1653d19333be Mon Sep 17 00:00:00 2001
-From: Dan Carpenter <dan.carpenter@oracle.com>
-Date: Wed, 15 Jun 2016 09:31:45 -0400
-Subject: [PATCH] KEYS: potential uninitialized variable
-
-If __key_link_begin() failed then "edit" would be uninitialized.  I've
-added a check to fix that.
-
-Fixes: f70e2e06196a ('KEYS: Do preallocation for __key_link()')
-Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
----
- security/keys/key.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/security/keys/key.c b/security/keys/key.c
-index bd5a272f28a6..346fbf201c22 100644
---- a/security/keys/key.c
-+++ b/security/keys/key.c
-@@ -597,7 +597,7 @@ int key_reject_and_link(struct key *key,
- 
- 	mutex_unlock(&key_construction_mutex);
- 
--	if (keyring)
-+	if (keyring && link_ret == 0)
- 		__key_link_end(keyring, &key->index_key, edit);
- 
- 	/* wake up anyone waiting for a key to be constructed */
--- 
-2.5.5
-
diff --git a/config-generic b/config-generic
index 49fb1906a..958ffc6a6 100644
--- a/config-generic
+++ b/config-generic
@@ -2577,6 +2577,7 @@ CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_KXTJ9=m
 # CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
+# CONFIG_INPUT_PWM_BEEPER is not set
 
 CONFIG_RMI4_CORE=m
 CONFIG_RMI4_I2C=m
@@ -5121,6 +5122,7 @@ CONFIG_BACKLIGHT_LP855X=m
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_PM8941_WLED is not set
+# CONFIG_BACKLIGHT_PWM is not set
 
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_PLATFORM=m
@@ -5720,7 +5722,7 @@ CONFIG_IMA_MEASURE_PCR_IDX=10
 CONFIG_IMA_LSM_RULES=y
 
 # CONFIG_EVM is not set
-# CONFIG_PWM is not set
+CONFIG_PWM=y
 # CONFIG_PWM_PCA9685 is not set
 
 CONFIG_LSM_MMAP_MIN_ADDR=65536
diff --git a/gitrev b/gitrev
index 130d506cd..81a8dd224 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-d325ea859490511322d1f151dc38577ee9a7c6da
+bb967271c0317de8eed56b20aae978d31507b033
diff --git a/kernel.spec b/kernel.spec
index ca799ff56..b8a84463b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -605,9 +605,6 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
 #rhbz 1346145
 Patch666: ath9k-fix-GPIO-mask-for-AR9462-and-AR9565.patch
 
-#CVE-2016-4470 rhbz 1341716 1346626
-Patch727: KEYS-potential-uninitialized-variable.patch
-
 #rhbz 1338025
 Patch728: hp-wmi-fix-wifi-cannot-be-hard-unblock.patch
 
@@ -2136,6 +2133,10 @@ fi
 #
 # 
 %changelog
+* Fri Jun 17 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc3.git3.1
+- Linux v4.7-rc3-87-gbb96727
+- enable CONFIG_PWM (rhbz 1347454)
+
 * Thu Jun 16 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc3.git2.1
 - Linux v4.7-rc3-55-gd325ea8
 
diff --git a/sources b/sources
index d087c25b4..6943dfb12 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 d2927020e24a76da4ab482a8bc3e9ef3  linux-4.6.tar.xz
 fd23b14b9d474c3dfacb6e8ee82d3a51  perf-man-4.6.tar.gz
 4197bebd41db2f1cfe9ba8e98cc53832  patch-4.7-rc3.xz
-d400a857bb167a7deae94b306721863a  patch-4.7-rc3-git2.xz
+3de27579cd64f3098f01465b8b762f0d  patch-4.7-rc3-git3.xz