summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-08-12 10:38:09 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-08-12 10:38:09 -0400
commit39f3a276ce8517ac9e52bb648317e498452c2817 (patch)
tree9d9b425b119b8f5bb63198d71013160329b80b7e
parent531b0ea5a0ee712930324efaa04413874e4882cf (diff)
downloadkernel-39f3a276ce8517ac9e52bb648317e498452c2817.tar.gz
kernel-39f3a276ce8517ac9e52bb648317e498452c2817.tar.xz
kernel-39f3a276ce8517ac9e52bb648317e498452c2817.zip
Linux v3.16-10473-gc8d6637d0497
-rw-r--r--config-armv71
-rw-r--r--config-x86-generic29
-rw-r--r--kernel.spec5
-rw-r--r--sources2
4 files changed, 35 insertions, 2 deletions
diff --git a/config-armv7 b/config-armv7
index 2c22fdda5..3ad36c3d3 100644
--- a/config-armv7
+++ b/config-armv7
@@ -596,6 +596,7 @@ CONFIG_PINCTRL_TEGRA30=y
CONFIG_USB_EHCI_TEGRA=m
CONFIG_RTC_DRV_TEGRA=m
CONFIG_CRYPTO_DEV_TEGRA_AES=m
+CONFIG_NOUVEAU_PLATFORM_DRIVER=m
CONFIG_SND_SOC_TEGRA=m
CONFIG_SND_SOC_TEGRA_ALC5632=m
diff --git a/config-x86-generic b/config-x86-generic
index 14f72bf3f..55857a67c 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -143,6 +143,8 @@ CONFIG_IPW2200_QOS=y
CONFIG_BLK_DEV_AMD74XX=y
+# I2C_ACPI casues I2C to be built in. This should probably be fixed.
+CONFIG_I2C_ACPI=y
CONFIG_I2C_AMD756=m
CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
@@ -379,6 +381,33 @@ CONFIG_GPIO_ICH=m
# CONFIG_GPIO_MCP23S08 is not set
# CONFIG_GPIO_F7188X is not set
+# These should all go away with IC2_ACPI is fixed
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_AXP20X is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_SEC_CORE is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
+
CONFIG_PCI_CNB20LE_QUIRK=y
diff --git a/kernel.spec b/kernel.spec
index 5a8339e67..6396d15df 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 3
+%define gitrev 4
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2240,6 +2240,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Aug 12 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git4.1
+- Linux v3.16-10473-gc8d6637d0497
+
* Sat Aug 09 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git3.1
- Linux v3.16-10013-gc309bfa9b481
- Temporarily don't apply crash driver patch
diff --git a/sources b/sources
index b55df2c10..597b1b482 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
5c569ed649a0c9711879f333e90c5386 linux-3.16.tar.xz
49868ce6467b35cd9ffea1120d129462 perf-man-3.16.tar.gz
-bf53e84f3e00b9f1fc6e3ca350bd8b12 patch-3.16-git3.xz
+3d73f74af21218bb2d563d706f5711eb patch-3.16-git4.xz