[kernel] r21854 - in dists/sid/linux/debian: . config

[Ben Hutchings]

Author: benh
Date: Tue Sep 16 17:34:02 2014
New Revision: 21854

Log:
Enable SATA_ZPODD and TRACER_SNAPSHOT as we are now doing an ABI bump

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/config

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Tue Sep 16 17:30:00 2014	(r21853)
+++ dists/sid/linux/debian/changelog	Tue Sep 16 17:34:02 2014	(r21854)
@@ -9,6 +9,8 @@
   * sfc: Adding PCI ID for Solarflare 7000 series 40G network adapter.
   * sfc: Add 40G link capability decoding
   * Bump ABI to 2 (Closes: #761874)
+  * ata: Enable SATA_ZPODD
+  * tracing: Enable TRACER_SNAPSHOT
 
   [ Ian Campbell ]
   * [armhf] Enable support for Exynos5 systems. (Closes: #759291)

Modified: dists/sid/linux/debian/config/config
==============================================================================
--- dists/sid/linux/debian/config/config	Tue Sep 16 17:30:00 2014	(r21853)
+++ dists/sid/linux/debian/config/config	Tue Sep 16 17:34:02 2014	(r21854)
@@ -146,8 +146,7 @@
 CONFIG_ATA=m
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
-#. TODO: Enable at next ABI bump
-# CONFIG_SATA_ZPODD is not set
+CONFIG_SATA_ZPODD=y
 CONFIG_SATA_PMP=y
 CONFIG_SATA_AHCI=m
 # CONFIG_SATA_AHCI_PLATFORM is not set
@@ -5115,8 +5114,7 @@
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
 CONFIG_FTRACE_SYSCALLS=y
-#. TODO: Enable at next ABI bump
-# CONFIG_TRACER_SNAPSHOT is not set
+CONFIG_TRACER_SNAPSHOT=y
 ## choice: Branch Profiling
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set