[kernel] Linux v3.13-8330-g4ba9920

Sun Jan 26 15:22:31 UTC 2014

commit 912ba5d1c457a6833e6319770815ff69144e9092
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Sat Jan 25 17:31:07 2014 -0500

    Linux v3.13-8330-g4ba9920

 config-generic                    |   20 ++++++-
 kernel.spec                       |   13 +---
 perf-plugin-dir.patch             |   24 --------
 peterz-printk-timestamp-fix.patch |  116 -------------------------------------
 sources                           |    2 +-
 5 files changed, 24 insertions(+), 151 deletions(-)
---

diff --git a/config-generic b/config-generic
index 479bfda..9804c3d 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 c87f183..da79cb1 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 at fedoraproject.org> - 3.14.0-0.rc0.git10.1
+- Linux v3.13-8330-g4ba9920
+
 * Sat Jan 25 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.14.0-0.rc0.git9.1
 - Linux v3.13-6058-g2d08cd0
 - Quiet incorrect usb phy error (rhbz 1057529)
diff --git a/sources b/sources
index 72289d5..d6b39e4 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
