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

[Ben Hutchings]

Author: benh
Date: Fri Sep 12 18:41:12 2014
New Revision: 21832

Log:
Defer enabling SATA_ZPODD and TRACER_SNAPSHOT to next 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	Fri Sep 12 18:04:57 2014	(r21831)
+++ dists/sid/linux/debian/changelog	Fri Sep 12 18:41:12 2014	(r21832)
@@ -12,7 +12,6 @@
   * can: Enable CAN_GS_USB as module
   * bluetooth: Enable BT_6LOWPAN
   * ubi: Enable MTD_UBI_BLOCK
-  * ata: Enable SATA_ZPODD
   * md: Enable DM_ERA as module
   * qlcnic: Enable QLCNIC_VXLAN
   * net/wireless: Enable RSI_91X, RSI_USB as modules
@@ -32,7 +31,6 @@
     as modules
   * ecryptfs: Enable ECRYPT_FS_MESSAGING
   * ceph: Enable CEPH_FSCACHE
-  * tracing: Enable TRACER_SNAPSHOT
   * crypto: Enable CRYPTO_LZ4, CRYPTO_LZ4HC as modules
   * [x86] mfd,gpio,i2c,watchdog: Enable KEMPLD_MFD, GPIO_KEMPLD, I2C_KEMPLD,
     KEMPLD_WDT as modules

Modified: dists/sid/linux/debian/config/config
==============================================================================
--- dists/sid/linux/debian/config/config	Fri Sep 12 18:04:57 2014	(r21831)
+++ dists/sid/linux/debian/config/config	Fri Sep 12 18:41:12 2014	(r21832)
@@ -146,7 +146,8 @@
 CONFIG_ATA=m
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_ACPI=y
-CONFIG_SATA_ZPODD=y
+#. TODO: Enable at next ABI bump
+# CONFIG_SATA_ZPODD is not set
 CONFIG_SATA_PMP=y
 CONFIG_SATA_AHCI=m
 # CONFIG_SATA_AHCI_PLATFORM is not set
@@ -5114,7 +5115,8 @@
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
 CONFIG_FTRACE_SYSCALLS=y
-CONFIG_TRACER_SNAPSHOT=y
+#. TODO: Enable at next ABI bump
+# CONFIG_TRACER_SNAPSHOT is not set
 ## choice: Branch Profiling
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set