Linux v3.17-9670-g0429fbc0bdc2

10 files changed, 18 insertions, 55 deletions

diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
index ae7163994..742938a84 100644
--- a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
+++ b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
@@ -15,10 +15,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 04e9f5505faa..14563a76c8c8 100644
+index b62bdcb1eb39..f74464c06826 100644
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
-@@ -3691,7 +3691,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -3695,7 +3695,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
  			the allocated input device; If set to 0, video driver
  			will only send out the event without touching backlight
  			brightness level.
diff --git a/config-arm-generic b/config-arm-generic
index 32b83a160..090e83cda 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -132,6 +132,7 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_MDIO_GPIO=m
 CONFIG_BACKLIGHT_GPIO=m
 CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_POWER_RESET_RESTART=y
 
 #i2c
diff --git a/config-armv7-generic b/config-armv7-generic
index 55c2bc8bf..f01dc336c 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -291,6 +291,7 @@ CONFIG_REGULATOR_MAX77686=m
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S5M8767=m
 CONFIG_COMMON_CLK_MAX77686=m
+CONFIG_COMMON_CLK_MAX77802=m
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_INPUT_MAX8997_HAPTIC=m
 CONFIG_CHARGER_MAX8997=m
@@ -298,6 +299,7 @@ CONFIG_LEDS_MAX8997=m
 CONFIG_RTC_DRV_MAX8997=m
 CONFIG_RTC_DRV_MAX77686=m
 CONFIG_RTC_DRV_MAX77802=m
+CONFIG_RTC_DRV_RK808=m
 CONFIG_EXTCON_MAX8997=m
 
 # Tegra
diff --git a/config-generic b/config-generic
index 16791f173..11293a8b3 100644
--- a/config-generic
+++ b/config-generic
@@ -4057,6 +4057,9 @@ CONFIG_MFD_VIPERBOARD=m
 # CONFIG_MFD_MC13XXX_SPI is not set
 # CONFIG_MFD_DA9052_SPI is not set
 # CONFIG_MFD_MENF21BMC is not set
+# CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_RK808 is not set
+# CONFIG_MFD_RN5T618 is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 
@@ -4879,6 +4882,8 @@ CONFIG_APM_POWER=m
 # CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24735 is not set
 CONFIG_POWER_RESET=y
+# CONFIG_POWER_RESET_LTC2952 is not set
+# CONFIG_POWER_RESET_SYSCON is not set
 
 # CONFIG_PDA_POWER is not set
 
diff --git a/config-powerpc-generic b/config-powerpc-generic
index bc0f9433e..1c337f92c 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -360,6 +360,7 @@ CONFIG_PPC_DENORMALISATION=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_FB_SSD1307=m
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_BACKLIGHT_PWM=m
diff --git a/config-x86-32-generic b/config-x86-32-generic
index 13e1bac70..c84fb5f3d 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -168,6 +168,7 @@ CONFIG_XO1_RFKILL=m
 CONFIG_X86_32_IRIS=m
 
 CONFIG_POWER_RESET_GPIO=y
+# CONFIG_POWER_RESET_GPIO_RESTART is not set
 
 
 
diff --git a/kernel.spec b/kernel.spec
index 63b2fbb51..44a5c0dd6 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 8
+%define gitrev 9
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -601,9 +601,6 @@ Patch26002: samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
 
 Patch26032: Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch
 
-#CVE-2014-7970 rhbz 1151095 1151484
-Patch26033: mnt-Prevent-pivot_root-from-creating-a-loop-in-the-m.patch
-
 Patch26035: nf_reject_ipv4-module-license-unspecified-taints-ker.patch
 
 #rhbz 1149509
@@ -1325,9 +1322,6 @@ ApplyPatch samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
 
 ApplyPatch Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch
 
-#CVE-2014-7970 rhbz 1151095 1151484
-ApplyPatch mnt-Prevent-pivot_root-from-creating-a-loop-in-the-m.patch
-
 ApplyPatch nf_reject_ipv4-module-license-unspecified-taints-ker.patch
 
 #rhbz 1149509
@@ -2204,6 +2198,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Wed Oct 15 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git9.1
+- Linux v3.17-9670-g0429fbc0bdc2
+
 * Tue Oct 14 2014 Josh Boyer <jwboyer@fedoraproject.org>
 - Add patches to fix elantech touchscreens (rhbz 1149509)
 
diff --git a/mnt-Prevent-pivot_root-from-creating-a-loop-in-the-m.patch b/mnt-Prevent-pivot_root-from-creating-a-loop-in-the-m.patch
deleted file mode 100644
index be3660125..000000000
--- a/mnt-Prevent-pivot_root-from-creating-a-loop-in-the-m.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: "Eric W. Biederman" <ebiederm@xmission.com>
-Date: Wed, 8 Oct 2014 10:42:27 -0700
-Subject: [PATCH] mnt: Prevent pivot_root from creating a loop in the mount
- tree
-
-Andy Lutomirski recently demonstrated that when chroot is used to set
-the root path below the path for the new ``root'' passed to pivot_root
-the pivot_root system call succeeds and leaks mounts.
-
-In examining the code I see that starting with a new root that is
-below the current root in the mount tree will result in a loop in the
-mount tree after the mounts are detached and then reattached to one
-another.  Resulting in all kinds of ugliness including a leak of that
-mounts involved in the leak of the mount loop.
-
-Prevent this problem by ensuring that the new mount is reachable from
-the current root of the mount tree.
-
-Upstream-status: Submitted for 3.18
-Bugzilla: 1151095,1151484
-
-Reported-by: Andy Lutomirski <luto@amacapital.net>
-Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
----
- fs/namespace.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/fs/namespace.c b/fs/namespace.c
-index 2651328d1790..fbba8b17330d 100644
---- a/fs/namespace.c
-+++ b/fs/namespace.c
-@@ -2915,6 +2915,9 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
- 	/* make sure we can reach put_old from new_root */
- 	if (!is_path_reachable(old_mnt, old.dentry, &new))
- 		goto out4;
-+	/* make certain new is below the root */
-+	if (!is_path_reachable(new_mnt, new.dentry, &root))
-+		goto out4;
- 	root_mp->m_count++; /* pin it so it won't go away */
- 	lock_mount_hash();
- 	detach_mnt(new_mnt, &parent_path);
--- 
-1.9.3
-
diff --git a/sources b/sources
index 042fae112..358544b07 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 fb30d0f29214d75cddd2faa94f73d5cf  linux-3.17.tar.xz
 159e969cbc27201d8e2fa0f609dc722f  perf-man-3.17.tar.gz
-6377140a0dc23037b33bc1e6bc625cbb  patch-3.17-git8.xz
+5f403d686bb7fb2160694fb375e6b73c  patch-3.17-git9.xz
diff --git a/watchdog-Disable-watchdog-on-virtual-machines.patch b/watchdog-Disable-watchdog-on-virtual-machines.patch
index b386ee1b9..610c7e0f1 100644
--- a/watchdog-Disable-watchdog-on-virtual-machines.patch
+++ b/watchdog-Disable-watchdog-on-virtual-machines.patch
@@ -20,7 +20,7 @@ Signed-off-by: Dave Jones <davej@redhat.com>
  1 file changed, 29 insertions(+)
 
 diff --git a/kernel/watchdog.c b/kernel/watchdog.c
-index 49e9537f3673..a800af056510 100644
+index 70bf11815f84..4eeb9923472b 100644
 --- a/kernel/watchdog.c
 +++ b/kernel/watchdog.c
 @@ -19,6 +19,7 @@