3.14.13-100.fc19.gnu

8 files changed, 79 insertions, 410 deletions

diff --git a/freed-ora/current/f19/intel_pstate-Fix-setting-VID.patch b/freed-ora/current/f19/intel_pstate-Fix-setting-VID.patch
deleted file mode 100644
index a71432c59..000000000
--- a/freed-ora/current/f19/intel_pstate-Fix-setting-VID.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-                                                                                                                                                                                                                                                               
-Delivered-To: jwboyer@gmail.com
-Received: by 10.76.6.212 with SMTP id d20csp423274oaa;
-        Fri, 20 Jun 2014 07:30:34 -0700 (PDT)
-X-Received: by 10.66.141.165 with SMTP id rp5mr5252763pab.90.1403274633343;
-        Fri, 20 Jun 2014 07:30:33 -0700 (PDT)
-Return-Path: <stable-owner@vger.kernel.org>
-Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
-        by mx.google.com with ESMTP id xz4si10079103pac.71.2014.06.20.07.29.38
-        for <multiple recipients>;
-        Fri, 20 Jun 2014 07:30:33 -0700 (PDT)
-Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67;
-Authentication-Results: mx.google.com;
-       spf=neutral (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) smtp.mail=stable-owner@vger.kernel.org;
-       dkim=neutral (body hash did not verify) header.i=@;
-       dmarc=fail (p=NONE dis=NONE) header.from=gmail.com
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1752826AbaFTO2N (ORCPT <rfc822;tuffkidtt@gmail.com> + 73 others);
-	Fri, 20 Jun 2014 10:28:13 -0400
-Received: from mail-pb0-f42.google.com ([209.85.160.42]:38213 "EHLO
-	mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1752069AbaFTO2M (ORCPT
-	<rfc822;stable@vger.kernel.org>); Fri, 20 Jun 2014 10:28:12 -0400
-Received: by mail-pb0-f42.google.com with SMTP id ma3so3196581pbc.29
-        for <multiple recipients>; Fri, 20 Jun 2014 07:28:11 -0700 (PDT)
-DKIM-Signature:	v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20120113;
-        h=from:to:cc:subject:date:message-id:in-reply-to:references;
-        bh=9oo+zXKxjbr7v1snerKTk1H7F9TqWZtlTUz/dYa9Mtc=;
-        b=dYHB8IsNt7nWot8Da4/spNLtKjWeMlpQv+LpR+c7Y8DUuJe1lcMqt6NeLHZcOBUv2Y
-         Y6Bw8IIE3DYaVUFzakB2oBRCHaQJwqERAb0+y8zVt4lkxRh6AOjeR6coDk9oE8sDQmkN
-         zZzv3mR6rd2sE6CkRFwkJUJgHRd5DgluDU96k7OKLEzJpuq+6BrvwPto8TU6ZMkmQiqj
-         pRP0ics6FdaE7GtFE6XmEjGYSnsAFzUn8ycgFPjZU39PhkhTDottomejlUEEs8NORxn3
-         eYxzh48Ae/P9JTgydBpMpUkpsb+86akHDWoTWG3z6D6mwCzFl9dNmUL43j/ONVjf6pPh
-         wopw==
-X-Received: by 10.66.122.70 with SMTP id lq6mr5211252pab.51.1403274491745;
-        Fri, 20 Jun 2014 07:28:11 -0700 (PDT)
-Received: from echolake.localdomain (static-50-43-41-81.bvtn.or.frontiernet.net. [50.43.41.81])
-        by mx.google.com with ESMTPSA id vx10sm44287848pac.17.2014.06.20.07.28.09
-        for <multiple recipients>
-        (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
-        Fri, 20 Jun 2014 07:28:10 -0700 (PDT)
-From:	dirk.brandewie@gmail.com
-X-Google-Original-From:	dirk.j.brandewie@intel.com
-To:	linux-pm@vger.kernel.org
-Cc:	rjw@rjwysocki.net, dirk.brandewie@gmail.com,
-	stable@vger.kernel.org, Dirk Brandewie <dirk.j.brandewie@intel.com>
-Subject: [PATCH 1/3] intel_pstate: Fix setting VID
-Date:	Fri, 20 Jun 2014 07:27:58 -0700
-Message-Id: <1403274480-10593-2-git-send-email-dirk.j.brandewie@intel.com>
-X-Mailer: git-send-email 1.9.0
-In-Reply-To: <1403274480-10593-1-git-send-email-dirk.j.brandewie@intel.com>
-References: <1403274480-10593-1-git-send-email-dirk.j.brandewie@intel.com>
-Sender:	stable-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <stable.vger.kernel.org>
-X-Mailing-List:	stable@vger.kernel.org
-
-From: Dirk Brandewie <dirk.j.brandewie@intel.com>
-
-Commit 21855ff5 intel_pstate: Set turbo VID for BayTrail introduced
-setting the turbo VID which is required to prevent a machine check on
-some Baytrail SKUs under heavy graphics based workloads.  The
-docmumentation update that brought the requirement to light also
-changed the bit mask used for enumerating P state and VID values from
-0x7f to 0x3f.
-
-This change returns the mask value to 0x7f.
-
-Tested with the Intel NUC DN2820FYK,
-BIOS version FYBYT10H.86A.0034.2014.0513.1413 with v3.16-rc1 and
-v3.14.8 kernel versions.
-
-Reported-by: Rune Reterson <rune@megahurts.dk>
-Reported-by: Eric Eickmeyer <erich@ericheickmeyer.com>
-Tested-by: Rune Reterson <rune@megahurts.dk>
-Tested-by: Eric Eickmeyer <erich@ericheickmeyer.com>
-
-References: https://bugzilla.kernel.org/show_bug.cgi?id=77951
-
-Cc: Cc: Stable <stable@vger.kernel.org>  [3.13+]
-Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
----
- drivers/cpufreq/intel_pstate.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
-index 924bb2d..74376d6 100644
---- a/drivers/cpufreq/intel_pstate.c
-+++ b/drivers/cpufreq/intel_pstate.c
-@@ -357,21 +357,21 @@ static int byt_get_min_pstate(void)
- {
- 	u64 value;
- 	rdmsrl(BYT_RATIOS, value);
--	return (value >> 8) & 0x3F;
-+	return (value >> 8) & 0x7F;
- }
- 
- static int byt_get_max_pstate(void)
- {
- 	u64 value;
- 	rdmsrl(BYT_RATIOS, value);
--	return (value >> 16) & 0x3F;
-+	return (value >> 16) & 0x7F;
- }
- 
- static int byt_get_turbo_pstate(void)
- {
- 	u64 value;
- 	rdmsrl(BYT_TURBO_RATIOS, value);
--	return value & 0x3F;
-+	return value & 0x7F;
- }
- 
- static void byt_set_pstate(struct cpudata *cpudata, int pstate)
-@@ -405,8 +405,8 @@ static void byt_get_vid(struct cpudata *cpudata)
- 
- 
- 	rdmsrl(BYT_VIDS, value);
--	cpudata->vid.min = int_tofp((value >> 8) & 0x3f);
--	cpudata->vid.max = int_tofp((value >> 16) & 0x3f);
-+	cpudata->vid.min = int_tofp((value >> 8) & 0x7f);
-+	cpudata->vid.max = int_tofp((value >> 16) & 0x7f);
- 	cpudata->vid.ratio = div_fp(
- 		cpudata->vid.max - cpudata->vid.min,
- 		int_tofp(cpudata->pstate.max_pstate -
--- 
-1.9.0
-
---
-To unsubscribe from this list: send the line "unsubscribe stable" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/freed-ora/current/f19/intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch b/freed-ora/current/f19/intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch
deleted file mode 100644
index 304b6009b..000000000
--- a/freed-ora/current/f19/intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-                                                                                                                                                                                                                                                               
-Delivered-To: jwboyer@gmail.com
-Received: by 10.76.6.212 with SMTP id d20csp423275oaa;
-        Fri, 20 Jun 2014 07:30:34 -0700 (PDT)
-X-Received: by 10.68.190.98 with SMTP id gp2mr5272210pbc.88.1403274634321;
-        Fri, 20 Jun 2014 07:30:34 -0700 (PDT)
-Return-Path: <stable-owner@vger.kernel.org>
-Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
-        by mx.google.com with ESMTP id hp1si10074557pad.83.2014.06.20.07.29.43
-        for <multiple recipients>;
-        Fri, 20 Jun 2014 07:30:34 -0700 (PDT)
-Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67;
-Authentication-Results: mx.google.com;
-       spf=neutral (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) smtp.mail=stable-owner@vger.kernel.org;
-       dkim=neutral (body hash did not verify) header.i=@;
-       dmarc=fail (p=NONE dis=NONE) header.from=gmail.com
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1752837AbaFTO2Q (ORCPT <rfc822;tuffkidtt@gmail.com> + 73 others);
-	Fri, 20 Jun 2014 10:28:16 -0400
-Received: from mail-pa0-f44.google.com ([209.85.220.44]:49238 "EHLO
-	mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1752834AbaFTO2P (ORCPT
-	<rfc822;stable@vger.kernel.org>); Fri, 20 Jun 2014 10:28:15 -0400
-Received: by mail-pa0-f44.google.com with SMTP id rd3so3177765pab.17
-        for <multiple recipients>; Fri, 20 Jun 2014 07:28:15 -0700 (PDT)
-DKIM-Signature:	v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20120113;
-        h=from:to:cc:subject:date:message-id:in-reply-to:references;
-        bh=rsR1AnYOOFONegcKUuZzrIkP/Fwwpd8RySrcXDcatYE=;
-        b=H8hEI3Sg3lQRMr4ADxJtNpRGhyOTkP+gFC3du64xhLqVHicLrvtD06Wz7Vv0AowO52
-         JpoocTnE8lUQvSMqev+LIh83DoFZxvYqrWqv0815LcZATxquRCPfNw8py9uTm3o0ABIy
-         PhXPM7UO278Ov67fqu63akRwHfrgtd22iXkHcn68ZqbTvdfo/jJlMcgRVoysP8XNPoIV
-         FZ4uVsHsjcx77zgA6A8t22vG5eozHRabvcvyxAp8eC/GwSjlWRFN7ETD28w4muvZcbFm
-         PFDieDk7detiTEqFyXncStI0i81Ezun+IyWnPnI1EOqPXKLoFaUiyxmw6Z7iOWLs0166
-         NLoA==
-X-Received: by 10.68.193.100 with SMTP id hn4mr5166204pbc.50.1403274495186;
-        Fri, 20 Jun 2014 07:28:15 -0700 (PDT)
-Received: from echolake.localdomain (static-50-43-41-81.bvtn.or.frontiernet.net. [50.43.41.81])
-        by mx.google.com with ESMTPSA id vx10sm44287848pac.17.2014.06.20.07.28.13
-        for <multiple recipients>
-        (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
-        Fri, 20 Jun 2014 07:28:13 -0700 (PDT)
-From:	dirk.brandewie@gmail.com
-X-Google-Original-From:	dirk.j.brandewie@intel.com
-To:	linux-pm@vger.kernel.org
-Cc:	rjw@rjwysocki.net, dirk.brandewie@gmail.com,
-	stable@vger.kernel.org, Dirk Brandewie <dirk.j.brandewie@intel.com>
-Subject: [PATCH 3/3] intel_pstate: Update documentation of {max,min}_perf_pct sysfs files
-Date:	Fri, 20 Jun 2014 07:28:00 -0700
-Message-Id: <1403274480-10593-4-git-send-email-dirk.j.brandewie@intel.com>
-X-Mailer: git-send-email 1.9.0
-In-Reply-To: <1403274480-10593-1-git-send-email-dirk.j.brandewie@intel.com>
-References: <1403274480-10593-1-git-send-email-dirk.j.brandewie@intel.com>
-Sender:	stable-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <stable.vger.kernel.org>
-X-Mailing-List:	stable@vger.kernel.org
-
-From: Dirk Brandewie <dirk.j.brandewie@intel.com>
-
-Update documentation to make the interpretation of the values clearer
-
-References: https://bugzilla.kernel.org/show_bug.cgi?id=64251
-
-Cc: Stable <stable@vger.kernel.org>  [3.13+]
-Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
----
- Documentation/cpu-freq/intel-pstate.txt | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/Documentation/cpu-freq/intel-pstate.txt b/Documentation/cpu-freq/intel-pstate.txt
-index e742d21..a69ffe1 100644
---- a/Documentation/cpu-freq/intel-pstate.txt
-+++ b/Documentation/cpu-freq/intel-pstate.txt
-@@ -15,10 +15,13 @@ New sysfs files for controlling P state selection have been added to
- /sys/devices/system/cpu/intel_pstate/
- 
-       max_perf_pct: limits the maximum P state that will be requested by
--      the driver stated as a percentage of the available performance.
-+      the driver stated as a percentage of the available performance. The
-+      available (P states) performance may be reduced by the no_turbo
-+      setting described below.
- 
-       min_perf_pct: limits the minimum P state that will be  requested by
--      the driver stated as a percentage of the available performance.
-+      the driver stated as a percentage of the max (non-turbo)
-+      performance level.
- 
-       no_turbo: limits the driver to selecting P states below the turbo
-       frequency range.
--- 
-1.9.0
-
---
-To unsubscribe from this list: send the line "unsubscribe stable" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/freed-ora/current/f19/intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch b/freed-ora/current/f19/intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch
deleted file mode 100644
index 5d66cbb88..000000000
--- a/freed-ora/current/f19/intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-                                                                                                                                                                                                                                                               
-Delivered-To: jwboyer@gmail.com
-Received: by 10.76.6.212 with SMTP id d20csp423277oaa;
-        Fri, 20 Jun 2014 07:30:35 -0700 (PDT)
-X-Received: by 10.68.139.36 with SMTP id qv4mr5223355pbb.82.1403274634649;
-        Fri, 20 Jun 2014 07:30:34 -0700 (PDT)
-Return-Path: <stable-owner@vger.kernel.org>
-Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
-        by mx.google.com with ESMTP id qv2si9954447pbb.188.2014.06.20.07.29.40
-        for <multiple recipients>;
-        Fri, 20 Jun 2014 07:30:34 -0700 (PDT)
-Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67;
-Authentication-Results: mx.google.com;
-       spf=neutral (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) smtp.mail=stable-owner@vger.kernel.org;
-       dkim=neutral (body hash did not verify) header.i=@;
-       dmarc=fail (p=NONE dis=NONE) header.from=gmail.com
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1752836AbaFTO2P (ORCPT <rfc822;tuffkidtt@gmail.com> + 73 others);
-	Fri, 20 Jun 2014 10:28:15 -0400
-Received: from mail-pb0-f51.google.com ([209.85.160.51]:46198 "EHLO
-	mail-pb0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1752834AbaFTO2N (ORCPT
-	<rfc822;stable@vger.kernel.org>); Fri, 20 Jun 2014 10:28:13 -0400
-Received: by mail-pb0-f51.google.com with SMTP id rp16so3192728pbb.10
-        for <multiple recipients>; Fri, 20 Jun 2014 07:28:13 -0700 (PDT)
-DKIM-Signature:	v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20120113;
-        h=from:to:cc:subject:date:message-id:in-reply-to:references;
-        bh=d4snuLkO7yJL099uI4N/+0VV5Rt4O8Cw+AAMmj8igq8=;
-        b=Hmy0dMfQu3uRTZzAq3zGf2sfVMhRUxySItx4tChAq3aaQAehBA+1vqEHeiQ6ZNpXrD
-         BJfbmvByR/d4G55woGKZbyOPL/t5XzkVVUuefHgKvEDjWbHns/RYax+lgRFI4Cb1aLEe
-         4u1/8cZ29BpFQ/yVW2D6/K6uwcJ6MQRK8lZISKjf/9oxZLg6vEeR4JGC70qo6yDHeUlu
-         VUQ3RrvKJ7NQw2nXTxAPuAvNEd+JCbKp6zO6gi6jET5vAQnevlrx+LxMjKssXI+QjXsH
-         N11ImMdOmbmBUgEIkFctpViP+fOFMTfkwIMh05FSQZtcy3NVF5kEUHR8N3B2klbGBYln
-         TJ8w==
-X-Received: by 10.68.133.163 with SMTP id pd3mr5111437pbb.166.1403274493273;
-        Fri, 20 Jun 2014 07:28:13 -0700 (PDT)
-Received: from echolake.localdomain (static-50-43-41-81.bvtn.or.frontiernet.net. [50.43.41.81])
-        by mx.google.com with ESMTPSA id vx10sm44287848pac.17.2014.06.20.07.28.11
-        for <multiple recipients>
-        (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
-        Fri, 20 Jun 2014 07:28:12 -0700 (PDT)
-From:	dirk.brandewie@gmail.com
-X-Google-Original-From:	dirk.j.brandewie@intel.com
-To:	linux-pm@vger.kernel.org
-Cc:	rjw@rjwysocki.net, dirk.brandewie@gmail.com,
-	stable@vger.kernel.org, Dirk Brandewie <dirk.j.brandewie@intel.com>
-Subject: [PATCH 2/3] intel_pstate: don't touch turbo bit if turbo disabled or unavailable.
-Date:	Fri, 20 Jun 2014 07:27:59 -0700
-Message-Id: <1403274480-10593-3-git-send-email-dirk.j.brandewie@intel.com>
-X-Mailer: git-send-email 1.9.0
-In-Reply-To: <1403274480-10593-1-git-send-email-dirk.j.brandewie@intel.com>
-References: <1403274480-10593-1-git-send-email-dirk.j.brandewie@intel.com>
-Sender:	stable-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <stable.vger.kernel.org>
-X-Mailing-List:	stable@vger.kernel.org
-
-From: Dirk Brandewie <dirk.j.brandewie@intel.com>
-
-If turbo is disabled in the BIOS bit 38 should be set in
-MSR_IA32_MISC_ENABLE register per section 14.3.2.1 of the SDM Vol 3
-document 325384-050US Feb 2014.  If this bit is set do *not* attempt
-to disable trubo via the MSR_IA32_PERF_CTL register.  On some systems
-trying to disable turbo via MSR_IA32_PERF_CTL will cause subsequent
-writes to MSR_IA32_PERF_CTL not take affect, in fact reading
-MSR_IA32_PERF_CTL will not show the IDA/Turbo DISENGAGE bit(32) as
-set. A write of bit 32 to zero returns to normal operation.
-
-Also deal with the case where the processor does not support
-turbo and the BIOS does not report the fact in MSR_IA32_MISC_ENABLE
-but does report the max and turbo P states as the same value.
-
-References: https://bugzilla.kernel.org/show_bug.cgi?id=64251
-
-Cc: Stable <stable@vger.kernel.org>  [3.13+]
-Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
----
- drivers/cpufreq/intel_pstate.c | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
-index 74376d6..127ead8 100644
---- a/drivers/cpufreq/intel_pstate.c
-+++ b/drivers/cpufreq/intel_pstate.c
-@@ -128,6 +128,7 @@ static struct pstate_funcs pstate_funcs;
- 
- struct perf_limits {
- 	int no_turbo;
-+	int turbo_disabled;
- 	int max_perf_pct;
- 	int min_perf_pct;
- 	int32_t max_perf;
-@@ -287,7 +288,10 @@ static ssize_t store_no_turbo(struct kobject *a, struct attribute *b,
- 	if (ret != 1)
- 		return -EINVAL;
- 	limits.no_turbo = clamp_t(int, input, 0 , 1);
--
-+	if (limits.turbo_disabled) {
-+		pr_warn("Turbo disabled by BIOS or unavailable on processor\n");
-+		limits.no_turbo = limits.turbo_disabled;
-+	}
- 	return count;
- }
- 
-@@ -381,7 +385,7 @@ static void byt_set_pstate(struct cpudata *cpudata, int pstate)
- 	u32 vid;
- 
- 	val = pstate << 8;
--	if (limits.no_turbo)
-+	if (limits.no_turbo && !limits.turbo_disabled)
- 		val |= (u64)1 << 32;
- 
- 	vid_fp = cpudata->vid.min + mul_fp(
-@@ -448,7 +452,7 @@ static void core_set_pstate(struct cpudata *cpudata, int pstate)
- 	u64 val;
- 
- 	val = pstate << 8;
--	if (limits.no_turbo)
-+	if (limits.no_turbo && !limits.turbo_disabled)
- 		val |= (u64)1 << 32;
- 
- 	wrmsrl_on_cpu(cpudata->cpu, MSR_IA32_PERF_CTL, val);
-@@ -741,7 +745,7 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
- 		limits.min_perf = int_tofp(1);
- 		limits.max_perf_pct = 100;
- 		limits.max_perf = int_tofp(1);
--		limits.no_turbo = 0;
-+		limits.no_turbo = limits.turbo_disabled;
- 		return 0;
- 	}
- 	limits.min_perf_pct = (policy->min * 100) / policy->cpuinfo.max_freq;
-@@ -784,6 +788,7 @@ static int intel_pstate_cpu_init(struct cpufreq_policy *policy)
- {
- 	struct cpudata *cpu;
- 	int rc;
-+	u64 misc_en;
- 
- 	rc = intel_pstate_init_cpu(policy->cpu);
- 	if (rc)
-@@ -791,8 +796,13 @@ static int intel_pstate_cpu_init(struct cpufreq_policy *policy)
- 
- 	cpu = all_cpu_data[policy->cpu];
- 
--	if (!limits.no_turbo &&
--		limits.min_perf_pct == 100 && limits.max_perf_pct == 100)
-+	rdmsrl(MSR_IA32_MISC_ENABLE, misc_en);
-+	if (misc_en & MSR_IA32_MISC_ENABLE_TURBO_DISABLE ||
-+		cpu->pstate.max_pstate == cpu->pstate.turbo_pstate) {
-+		limits.turbo_disabled = 1;
-+		limits.no_turbo = 1;
-+	}
-+	if (limits.min_perf_pct == 100 && limits.max_perf_pct == 100)
- 		policy->policy = CPUFREQ_POLICY_PERFORMANCE;
- 	else
- 		policy->policy = CPUFREQ_POLICY_POWERSAVE;
--- 
-1.9.0
-
---
-To unsubscribe from this list: send the line "unsubscribe stable" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/freed-ora/current/f19/kernel.spec b/freed-ora/current/f19/kernel.spec
index 5ac0c6cdf..2f68a7a73 100644
--- a/freed-ora/current/f19/kernel.spec
+++ b/freed-ora/current/f19/kernel.spec
@@ -112,7 +112,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 12
+%define stable_update 13
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -815,16 +815,15 @@ Patch25092: Input-elantech-add-support-for-newer-elantech-touchpads.patch
 Patch25097: e1000e-Fix-SHRA-register-access-for-82579.patch
 Patch25098: e1000e-Failure-to-write-SHRA-turns-on-PROMISC-mode.patch
 
-Patch25102: intel_pstate-Fix-setting-VID.patch
-Patch25103: intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch
-Patch25104: intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch
-
 Patch25109: revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch
 
 #rhbz 1021036
 Patch25110: 0001-ideapad-laptop-Blacklist-rfkill-control-on-the-Lenov.patch
 Patch25111: 0002-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch
 
+#CVE-2014-4943 rhbz 1119458 1120542
+Patch25115: net-l2tp-don-t-fall-back-on-UDP-get-set-sockopt.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1583,16 +1582,15 @@ ApplyPatch Input-elantech-add-support-for-newer-elantech-touchpads.patch
 ApplyPatch e1000e-Fix-SHRA-register-access-for-82579.patch
 ApplyPatch e1000e-Failure-to-write-SHRA-turns-on-PROMISC-mode.patch
 
-ApplyPatch intel_pstate-Fix-setting-VID.patch
-ApplyPatch intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch
-ApplyPatch intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch
-
 ApplyPatch revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch
 
 #rhbz 1021036
 ApplyPatch 0001-ideapad-laptop-Blacklist-rfkill-control-on-the-Lenov.patch
 ApplyPatch 0002-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch
 
+#CVE-2014-4943 rhbz 1119458 1120542
+ApplyPatch net-l2tp-don-t-fall-back-on-UDP-get-set-sockopt.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2416,6 +2414,13 @@ fi
 # and build.
 
 %changelog
+* Fri Jul 18 2014 Alexandre Oliva <lxoliva@fsfla.org> -libre
+- GNU Linux-libre 3.14.13-gnu.
+
+* Thu Jul 17 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.13-100
+- Linux v3.14.13
+- CVE-2014-4943 pppol2tp level handling (rhbz 1119458 1120542)
+
 * Mon Jul 14 2014 Alexandre Oliva <lxoliva@fsfla.org> -libre
 - GNU Linux-libre 3.14.12-gnu.
 
diff --git a/freed-ora/current/f19/net-l2tp-don-t-fall-back-on-UDP-get-set-sockopt.patch b/freed-ora/current/f19/net-l2tp-don-t-fall-back-on-UDP-get-set-sockopt.patch
new file mode 100644
index 000000000..141048a36
--- /dev/null
+++ b/freed-ora/current/f19/net-l2tp-don-t-fall-back-on-UDP-get-set-sockopt.patch
@@ -0,0 +1,57 @@
+Bugzilla: 1120542
+Upstream-status: 3.16 and CC'd to stable
+
+From 3cf521f7dc87c031617fd47e4b7aa2593c2f3daf Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sasha.levin@oracle.com>
+Date: Mon, 14 Jul 2014 17:02:31 -0700
+Subject: [PATCH] net/l2tp: don't fall back on UDP [get|set]sockopt
+
+The l2tp [get|set]sockopt() code has fallen back to the UDP functions
+for socket option levels != SOL_PPPOL2TP since day one, but that has
+never actually worked, since the l2tp socket isn't an inet socket.
+
+As David Miller points out:
+
+  "If we wanted this to work, it'd have to look up the tunnel and then
+   use tunnel->sk, but I wonder how useful that would be"
+
+Since this can never have worked so nobody could possibly have depended
+on that functionality, just remove the broken code and return -EINVAL.
+
+Reported-by: Sasha Levin <sasha.levin@oracle.com>
+Acked-by: James Chapman <jchapman@katalix.com>
+Acked-by: David Miller <davem@davemloft.net>
+Cc: Phil Turnbull <phil.turnbull@oracle.com>
+Cc: Vegard Nossum <vegard.nossum@oracle.com>
+Cc: Willy Tarreau <w@1wt.eu>
+Cc: stable@vger.kernel.org
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ net/l2tp/l2tp_ppp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
+index 950909f04ee6..13752d96275e 100644
+--- a/net/l2tp/l2tp_ppp.c
++++ b/net/l2tp/l2tp_ppp.c
+@@ -1365,7 +1365,7 @@ static int pppol2tp_setsockopt(struct socket *sock, int level, int optname,
+ 	int err;
+ 
+ 	if (level != SOL_PPPOL2TP)
+-		return udp_prot.setsockopt(sk, level, optname, optval, optlen);
++		return -EINVAL;
+ 
+ 	if (optlen < sizeof(int))
+ 		return -EINVAL;
+@@ -1491,7 +1491,7 @@ static int pppol2tp_getsockopt(struct socket *sock, int level, int optname,
+ 	struct pppol2tp_session *ps;
+ 
+ 	if (level != SOL_PPPOL2TP)
+-		return udp_prot.getsockopt(sk, level, optname, optval, optlen);
++		return -EINVAL;
+ 
+ 	if (get_user(len, optlen))
+ 		return -EFAULT;
+-- 
+1.9.3
+
diff --git a/freed-ora/current/f19/patch-3.14-gnu-3.14.12-gnu.xz.sign b/freed-ora/current/f19/patch-3.14-gnu-3.14.12-gnu.xz.sign
deleted file mode 100644
index b781743d3..000000000
--- a/freed-ora/current/f19/patch-3.14-gnu-3.14.12-gnu.xz.sign
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEABECAAYFAlO+C8kACgkQvLfPh359R6cG0QCfZ5Sw/F3YHIfnJuVghm/qhTd0
-2fsAn3d+cSQ5/qtd7asjWFO9ooHRnrnW
-=NU39
------END PGP SIGNATURE-----
diff --git a/freed-ora/current/f19/patch-3.14-gnu-3.14.13-gnu.xz.sign b/freed-ora/current/f19/patch-3.14-gnu-3.14.13-gnu.xz.sign
new file mode 100644
index 000000000..f0a44066d
--- /dev/null
+++ b/freed-ora/current/f19/patch-3.14-gnu-3.14.13-gnu.xz.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEABECAAYFAlPI9y4ACgkQvLfPh359R6fb9ACfZPV4NdjZZbIBFXQ3bZgDyQhw
+JxsAn29jDJZ7V/dbNeStL9pHzdOk3L6Z
+=1CvN
+-----END PGP SIGNATURE-----
diff --git a/freed-ora/current/f19/sources b/freed-ora/current/f19/sources
index ec397bf45..ffda6334d 100644
--- a/freed-ora/current/f19/sources
+++ b/freed-ora/current/f19/sources
@@ -1,2 +1,2 @@
 c108ec52eeb2a9b9ddbb8d12496ff25f  linux-libre-3.14-gnu.tar.xz
-495d7069583020eb66cdbbca8fdfe267  patch-3.14-gnu-3.14.12-gnu.xz
+31250eec55d458495b34efdeb514c1a0  patch-3.14-gnu-3.14.13-gnu.xz