diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2013-09-12 15:36:34 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2013-09-12 15:36:34 -0400 |
| commit | d3179a38e0632d711ecce36cf4f89c4c6afefe45 (patch) | |
| tree | 7a3f2229f2ffc8121c5bc696d9fc2791cbdb3abb | |
| parent | 700b375ec0451e65534ffca0cf605d217bb532ef (diff) | |
| download | kernel-d3179a38e0632d711ecce36cf4f89c4c6afefe45.tar.gz kernel-d3179a38e0632d711ecce36cf4f89c4c6afefe45.tar.xz kernel-d3179a38e0632d711ecce36cf4f89c4c6afefe45.zip | |
Linux v3.11-9747-gff812d7
| -rw-r--r-- | config-armv7 | 1 | ||||
| -rw-r--r-- | config-generic | 3 | ||||
| -rw-r--r-- | kernel.spec | 7 | ||||
| -rw-r--r-- | perf-arm-fix.patch | 24 | ||||
| -rw-r--r-- | sources | 2 |
5 files changed, 9 insertions, 28 deletions
diff --git a/config-armv7 b/config-armv7 index 34b9c939f..402939030 100644 --- a/config-armv7 +++ b/config-armv7 @@ -350,6 +350,7 @@ CONFIG_MFD_TI_AM335X_TSCADC=m # Allwinner a1x CONFIG_PINCTRL_SUNXI=y +CONFIG_SUNXI_WATCHDOG=m CONFIG_MDIO_SUN4I=m CONFIG_NET_VENDOR_ALLWINNER=y CONFIG_SUN4I_EMAC=m diff --git a/config-generic b/config-generic index d20fc1a10..7bd40db90 100644 --- a/config-generic +++ b/config-generic @@ -3935,6 +3935,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set # CONFIG_BTRFS_DEBUG is not set +# CONFIG_BTRFS_ASSERT is not set CONFIG_CONFIGFS_FS=y @@ -4417,6 +4418,8 @@ CONFIG_LEDS_DELL_NETBOOKS=m # CONFIG_LEDS_LM355x is not set # CONFIG_LEDS_OT200 is not set # CONFIG_LEDS_PWM is not set +# CONFIG_LEDS_LP8501 is not set +# CONFIG_LEDS_PCA963X is not set CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m diff --git a/kernel.spec b/kernel.spec index 612999e61..088729ff2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -95,7 +95,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 22 +%define gitrev 23 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -761,7 +761,6 @@ Patch25047: drm-radeon-Disable-writeback-by-default-on-ppc.patch #CVE-2013-2897 rhbz 1000536 1002600 CVE-2013-2899 rhbz 1000373 1002604 Patch25099: HID-CVE-fixes.patch -Patch25100: perf-arm-fix.patch Patch25101: fix-arm-neon-xor.patch # END OF PATCH DEFINITIONS @@ -1485,7 +1484,6 @@ ApplyPatch drm-radeon-Disable-writeback-by-default-on-ppc.patch #CVE-2013-2897 rhbz 1000536 1002600 CVE-2013-2899 rhbz 1000373 1002604 ApplyPatch HID-CVE-fixes.patch -ApplyPatch perf-arm-fix.patch ApplyPatch fix-arm-neon-xor.patch # END OF PATCH APPLICATIONS @@ -2289,6 +2287,9 @@ fi # ||----w | # || || %changelog +* Thu Sep 12 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git23.1 +- Linux v3.11-9747-gff812d7 + * Thu Sep 12 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git22.1 - Linux v3.11-9420-gd5d04bb diff --git a/perf-arm-fix.patch b/perf-arm-fix.patch deleted file mode 100644 index 795c20efd..000000000 --- a/perf-arm-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Kyle McMartin <kyle@redhat.com> - -MAP_32BIT is defined only on x86... this means perf fails to build on -all other platforms. - -Signed-off-by: Kyle McMartin <kyle@redhat.com> - ---- a/tools/perf/builtin-trace.c -+++ b/tools/perf/builtin-trace.c -@@ -100,7 +100,9 @@ static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, - - P_MMAP_FLAG(SHARED); - P_MMAP_FLAG(PRIVATE); -+#ifdef MAP_32BIT - P_MMAP_FLAG(32BIT); -+#endif - P_MMAP_FLAG(ANONYMOUS); - P_MMAP_FLAG(DENYWRITE); - P_MMAP_FLAG(EXECUTABLE); --- -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/
\ No newline at end of file @@ -1,2 +1,2 @@ fea363551ff45fbe4cb88497b863b261 linux-3.11.tar.xz -e7b598b99fa4cd0b6775c81f962a55fb patch-3.11-git22.xz +c4231e27e9f568d4a9bf287489d6e970 patch-3.11-git23.xz |