[kernel] r22430 - in dists/trunk/linux/debian: . config

[Ben Hutchings]

Author: benh
Date: Sat Feb 28 21:36:48 2015
New Revision: 22430

Log:
nfsd: Enable NFSD_V4_SECURITY_LABEL

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

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sat Feb 28 16:17:12 2015	(r22429)
+++ dists/trunk/linux/debian/changelog	Sat Feb 28 21:36:48 2015	(r22430)
@@ -2,6 +2,7 @@
 
   * [armhf] Drop sun7i device tree patches which are included in 3.19
     (fixes FTBFS)
+  * nfsd: Enable NFSD_V4_SECURITY_LABEL
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 16 Feb 2015 03:57:08 +0000
 

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Sat Feb 28 16:17:12 2015	(r22429)
+++ dists/trunk/linux/debian/config/config	Sat Feb 28 21:36:48 2015	(r22430)
@@ -4844,7 +4844,7 @@
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
+CONFIG_NFSD_V4_SECURITY_LABEL=y
 # CONFIG_NFSD_FAULT_INJECTION is not set
 
 ##