Linux v3.13-8330-g4ba9920

5 files changed, 24 insertions, 151 deletions

diff --git a/config-generic b/config-generic
index 479bfda3a..9804c3d23 100644
--- a/config-generic
+++ b/config-generic
@@ -857,6 +857,7 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
 CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CPU=m
@@ -873,8 +874,10 @@ CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -988,6 +991,7 @@ CONFIG_IP6_NF_TARGET_MASQUERADE=m
 
 # nf_tables support
 CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
 CONFIG_NFT_CT=m
@@ -997,6 +1001,8 @@ CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_NAT=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NF_TABLES_IPV4=m
@@ -1137,6 +1143,8 @@ CONFIG_NET_SCH_QFQ=m
 CONFIG_NET_SCH_CODEL=m
 CONFIG_NET_SCH_FQ_CODEL=m
 CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
 CONFIG_NET_SCH_PLUG=m
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_ACT=y
@@ -1186,7 +1194,6 @@ CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=y
 CONFIG_OPENVSWITCH_VXLAN=y
 CONFIG_VSOCKETS=m
-CONFIG_NETPRIO_CGROUP=m
 
 
 #
@@ -1374,6 +1381,10 @@ CONFIG_IXGBE_DCB=y
 CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_PTP=y
 CONFIG_I40E=m
+# CONFIG_I40E_VXLAN is not set
+# CONFIG_I40E_DCB is not set
+# CONFIG_I40EVF is not set
+
 
 # CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_NET_VENDOR_MARVELL=y
@@ -1620,6 +1631,9 @@ CONFIG_ATH9K_HTC=m
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 # CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+# CONFIG_ATH9K_STATION_STATISTICS is not set
+# CONFIG_ATH9K_WOW is not set
+# 
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 # CONFIG_ATH10K_DEBUG is not set
@@ -1814,6 +1828,8 @@ CONFIG_NFC_HCI=m
 CONFIG_NFC_SHDLC=y
 CONFIG_NFC_LLCP=y
 CONFIG_NFC_SIM=m
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
 
 #
 # Near Field Communication (NFC) devices
@@ -4491,6 +4507,8 @@ CONFIG_MEMCG_SWAP_ENABLED=y
 CONFIG_MEMCG_KMEM=y
 # CONFIG_CGROUP_HUGETLB is not set
 CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_NET_PRIO=m
+# CONFIG_CGROUP_NET_CLASSID is not set
 CONFIG_BLK_CGROUP=y
 
 # CONFIG_SYSFS_DEPRECATED is not set
diff --git a/kernel.spec b/kernel.spec
index c87f18383..da79cb1ee 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 9
+%define gitrev 10
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -627,10 +627,6 @@ Patch25166: sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch
 Patch25167: rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch
 Patch25168: rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch
 
-Patch25185: perf-plugin-dir.patch
-
-Patch25186: peterz-printk-timestamp-fix.patch
-
 Patch25187: revert-fsnotify-changes.patch
 
 #rhbz 1057529
@@ -1285,10 +1281,6 @@ ApplyPatch rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch
 ApplyPatch sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch
 ApplyPatch rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch
 
-ApplyPatch perf-plugin-dir.patch
-
-ApplyPatch peterz-printk-timestamp-fix.patch
-
 # Davej and others are reporting slab corruption with the fsnotify changes.
 # Revert them until they're worked out upstream
 ApplyPatch revert-fsnotify-changes.patch
@@ -2075,6 +2067,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Sat Jan 25 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git10.1
+- Linux v3.13-8330-g4ba9920
+
 * Sat Jan 25 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git9.1
 - Linux v3.13-6058-g2d08cd0
 - Quiet incorrect usb phy error (rhbz 1057529)
diff --git a/perf-plugin-dir.patch b/perf-plugin-dir.patch
deleted file mode 100644
index d4a972eb8..000000000
--- a/perf-plugin-dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
-index 56d52a3..005c9cc 100644
---- a/tools/lib/traceevent/Makefile
-+++ b/tools/lib/traceevent/Makefile
-@@ -63,7 +63,7 @@ endif
- endif
- 
- ifeq ($(set_plugin_dir),1)
--PLUGIN_DIR = -DPLUGIN_DIR="$(DESTDIR)/$(plugin_dir)"
-+PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
- PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
- endif
- 
-diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
-index d604e50..c48d449 100644
---- a/tools/perf/config/Makefile
-+++ b/tools/perf/config/Makefile
-@@ -600,5 +600,5 @@ perfexec_instdir_SQ = $(subst ','\'',$(perfexec_instdir))
- # Otherwise we install plugins into the global $(libdir).
- ifdef DESTDIR
- plugindir=$(libdir)/traceevent/plugins
--plugindir_SQ= $(subst ','\'',$(prefix)/$(plugindir))
-+plugindir_SQ= $(subst ','\'',$(plugindir))
- endif
diff --git a/peterz-printk-timestamp-fix.patch b/peterz-printk-timestamp-fix.patch
deleted file mode 100644
index 825f4f749..000000000
--- a/peterz-printk-timestamp-fix.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-                                                                                                                                                                                                                                                               
-Delivered-To: jwboyer@gmail.com
-Received: by 10.76.27.197 with SMTP id v5csp2271oag;
-        Thu, 23 Jan 2014 01:54:21 -0800 (PST)
-X-Received: by 10.66.136.131 with SMTP id qa3mr7006698pab.77.1390470860654;
-        Thu, 23 Jan 2014 01:54:20 -0800 (PST)
-Return-Path: <linux-kernel-owner@vger.kernel.org>
-Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
-        by mx.google.com with ESMTP id qv10si13378362pbb.142.2014.01.23.01.53.38
-        for <multiple recipients>;
-        Thu, 23 Jan 2014 01:54:20 -0800 (PST)
-Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
-Authentication-Results: mx.google.com;
-       spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mail=linux-kernel-owner@vger.kernel.org
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1751970AbaAWJsq (ORCPT <rfc822;ksvahn@gmail.com> + 99 others);
-	Thu, 23 Jan 2014 04:48:46 -0500
-Received: from merlin.infradead.org ([205.233.59.134]:55711 "EHLO
-	merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1751445AbaAWJso (ORCPT
-	<rfc822;linux-kernel@vger.kernel.org>);
-	Thu, 23 Jan 2014 04:48:44 -0500
-Received: from dhcp-077-248-225-117.chello.nl ([77.248.225.117] helo=twins)
-	by merlin.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux))
-	id 1W6GtY-00025n-Ny; Thu, 23 Jan 2014 09:48:21 +0000
-Received: by twins (Postfix, from userid 1000)
-	id 0B4E580383F6; Thu, 23 Jan 2014 10:48:04 +0100 (CET)
-Date:	Thu, 23 Jan 2014 10:48:04 +0100
-From:	Peter Zijlstra <peterz@infradead.org>
-To:	Markus Trippelsdorf <markus@trippelsdorf.de>
-Cc:	Sasha Levin <sasha.levin@oracle.com>,
-	Arjan van de Ven <arjan@linux.intel.com>, lenb@kernel.org,
-	rjw@rjwysocki.net, Eliezer Tamir <eliezer.tamir@linux.intel.com>,
-	rui.zhang@intel.com, jacob.jun.pan@linux.intel.com,
-	Mike Galbraith <bitbucket@online.de>,
-	Ingo Molnar <mingo@kernel.org>, hpa@zytor.com,
-	paulmck@linux.vnet.ibm.com, Thomas Gleixner <tglx@linutronix.de>,
-	John Stultz <john.stultz@linaro.org>,
-	Andy Lutomirski <luto@amacapital.net>,
-	linux-kernel@vger.kernel.org, dyoung@redhat.com
-Subject: Re: [PATCH 13/15] sched: Use a static_key for sched_clock_stable
-Message-ID: <20140123094804.GP30183@twins.programming.kicks-ass.net>
-References: <20140122123022.GN31570@twins.programming.kicks-ass.net>
- <20140122131456.GA389@x4>
- <52DFD50E.800@oracle.com>
- <20140122183538.GA389@x4>
- <20140122184253.GN30183@twins.programming.kicks-ass.net>
- <20140122190905.GA391@x4>
- <20140122191254.GA390@x4>
- <20140122201605.GU11314@laptop.programming.kicks-ass.net>
- <20140122210814.GC9481@laptop.programming.kicks-ass.net>
- <20140122211740.GA391@x4>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-In-Reply-To: <20140122211740.GA391@x4>
-User-Agent: Mutt/1.5.21 (2012-12-30)
-Sender:	linux-kernel-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List:	linux-kernel@vger.kernel.org
-
-On Wed, Jan 22, 2014 at 10:17:40PM +0100, Markus Trippelsdorf wrote:
-> Yes. Thanks Peter.
-> 
-
-Ah much simpler patch that should have the same effect:
-
----
-Subject: sched/x86/tsc: Initialize multiplier to 0
-From: Peter Zijlstra <peterz@infradead.org>
-Date: Wed, 22 Jan 2014 22:08:14 +0100
-
-Since we keep the clock value linearly continuous on frequency change,
-make sure the initial multiplier is 0, such that out initial value is
-0. Without this we compute the initial value at whatever the TSC has
-managed to reach since power-on.
-
-Fixes: 20d1c86a57762 ("sched/clock, x86: Rewrite cyc2ns() to avoid the need to disable IRQs")
-Cc: lenb@kernel.org
-Cc: rjw@rjwysocki.net
-Cc: Eliezer Tamir <eliezer.tamir@linux.intel.com>
-Cc: rui.zhang@intel.com
-Cc: jacob.jun.pan@linux.intel.com
-Cc: Mike Galbraith <bitbucket@online.de>
-Cc: Ingo Molnar <mingo@kernel.org>
-Cc: hpa@zytor.com
-Cc: paulmck@linux.vnet.ibm.com
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: John Stultz <john.stultz@linaro.org>
-Cc: Andy Lutomirski <luto@amacapital.net>
-Cc: Arjan van de Ven <arjan@linux.intel.com>
-Cc: Sasha Levin <sasha.levin@oracle.com>
-Cc: dyoung@redhat.com
-Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
-Signed-off-by: Peter Zijlstra <peterz@infradead.org>
----
- arch/x86/kernel/tsc.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/x86/kernel/tsc.c
-+++ b/arch/x86/kernel/tsc.c
-@@ -180,7 +180,7 @@ static void cyc2ns_write_end(int cpu, st
- 
- static void cyc2ns_data_init(struct cyc2ns_data *data)
- {
--	data->cyc2ns_mul = 1U << CYC2NS_SCALE_FACTOR;
-+	data->cyc2ns_mul = 0;
- 	data->cyc2ns_shift = CYC2NS_SCALE_FACTOR;
- 	data->cyc2ns_offset = 0;
- 	data->__count = 0;
---
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
diff --git a/sources b/sources
index 72289d578..d6b39e43b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 0ecbaf65c00374eb4a826c2f9f37606f  linux-3.13.tar.xz
 732d1952898b28d5ccc264cad77b0619  perf-man-3.13.tar.gz
-c501aeaa0ddabd55b087c8f8d7fb954a  patch-3.13-git9.xz
+f60d90158ca7c89ebf4b316e49845e8b  patch-3.13-git10.xz