[kernel] Linux v3.15-rc1-49-g10ec34fcb100

[Josh Boyer]

commit 865dffb33011f8cef8f558b5062defcb5be12024
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Wed Apr 16 11:08:24 2014 -0400

    Linux v3.15-rc1-49-g10ec34fcb100

 ...egs-and-reglen-for-i3100-and-ich6-chipset.patch |   35 +++++++++++
 kernel.spec                                        |   27 ++++-----
 ...d-includes-for-ETH_HLEN-and-VLAN_HLEN-def.patch |   40 ------------
 ...rent-group_info-should-be-put-after-using.patch |   64 --------------------
 sources                                            |    2 +-
 5 files changed, 48 insertions(+), 120 deletions(-)
---
diff --git a/gpio-ich-set-regs-and-reglen-for-i3100-and-ich6-chipset.patch b/gpio-ich-set-regs-and-reglen-for-i3100-and-ich6-chipset.patch
new file mode 100644
index 0000000..eff2f1c
--- /dev/null
+++ b/gpio-ich-set-regs-and-reglen-for-i3100-and-ich6-chipset.patch
@@ -0,0 +1,35 @@
+Bugzilla: N/A (Eric Paris reported via IRC)
+Upstream-status: Sent for 3.15
+
+From: Vincent Donnefort <vdonnefort at gmail.com>
+
+This patch fixes kernel NULL pointer BUG introduced by the following commit:
+b667cf488aa9476b0ab64acd91f2a96f188cfd21
+gpio: ich: Add support for multiple register addresses.
+
+Signed-off-by: Vincent Donnefort <vdonnefort at gmail.com>
+
+diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
+index e73c675..7030422 100644
+--- a/drivers/gpio/gpio-ich.c
++++ b/drivers/gpio/gpio-ich.c
+@@ -305,6 +305,8 @@ static struct ichx_desc ich6_desc = {
+ 
+ 	.ngpio = 50,
+ 	.have_blink = true,
++	.regs = ichx_regs,
++	.reglen = ichx_reglen,
+ };
+ 
+ /* Intel 3100 */
+@@ -324,6 +326,8 @@ static struct ichx_desc i3100_desc = {
+ 	.uses_gpe0 = true,
+ 
+ 	.ngpio = 50,
++	.regs = ichx_regs,
++	.reglen = ichx_reglen,
+ };
+ 
+ /* ICH7 and ICH8-based */
+-- 
+1.8.3.2
diff --git a/kernel.spec b/kernel.spec
index 8c2b26f..4f2d960 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -627,17 +627,14 @@ Patch22000: weird-root-dentry-name-debug.patch
 
 Patch25047: drm-radeon-Disable-writeback-by-default-on-ppc.patch
 
-Patch25058: net-cpts-Add-includes-for-ETH_HLEN-and-VLAN_HLEN-def.patch
-Patch25061: gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch
-
 #rhbz 1048314
-Patch25062: 0001-HID-rmi-introduce-RMI-driver-for-Synaptics-touchpads.patch
-
-#CVE-2014-2851 rhbz 1086730 1087420
-Patch25059: net-ipv4-current-group_info-should-be-put-after-using.patch
+Patch25048: 0001-HID-rmi-introduce-RMI-driver-for-Synaptics-touchpads.patch
 
 #rhbz 1085582 1085697
-Patch25063: 0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch
+Patch25049: 0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch
+
+Patch25061: gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch
+Patch25062: gpio-ich-set-regs-and-reglen-for-i3100-and-ich6-chipset.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -1275,18 +1272,15 @@ ApplyPatch ath9k_rx_dma_stop_check.patch
 
 ApplyPatch drm-radeon-Disable-writeback-by-default-on-ppc.patch
 
-ApplyPatch net-cpts-Add-includes-for-ETH_HLEN-and-VLAN_HLEN-def.patch
-ApplyPatch gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch
-
 #rhbz 1048314
 ApplyPatch 0001-HID-rmi-introduce-RMI-driver-for-Synaptics-touchpads.patch
 
-#CVE-2014-2851 rhbz 1086730 1087420
-ApplyPatch net-ipv4-current-group_info-should-be-put-after-using.patch
-
 #rhbz 1085582 1085697
 ApplyPatch 0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch
 
+ApplyPatch gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch
+ApplyPatch gpio-ich-set-regs-and-reglen-for-i3100-and-ich6-chipset.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2066,6 +2060,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Wed Apr 16 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.15.0-0.rc1.git2.1
+- Linux v3.15-rc1-49-g10ec34fcb100
+
 * Tue Apr 15 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.15.0-0.rc1.git1.1
 - Linux v3.15-rc1-12-g55101e2d6ce1
 - Reenable debugging options.
diff --git a/sources b/sources
index e52ea92..e5916df 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 b621207b3f6ecbb67db18b13258f8ea8  linux-3.14.tar.xz
 d36baf2d62de5aa61f10a976d00d2d2a  perf-man-3.14.tar.gz
 13e450bb569cfad7c246f0746a7f3217  patch-3.15-rc1.xz
-4976467d25e3ed20728a29cf175c05b5  patch-3.15-rc1-git1.xz
+9bbba81040ee55548742f24f12de8688  patch-3.15-rc1-git2.xz