Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull namespace fixes from Eric Biederman:
 "This tree contains 4 fixes.

  The first is a fix for a race that can causes oopses under the right
  circumstances, and that someone just recently encountered.

  Past that are several small trivial correct fixes. A real issue that
  was blocking development of an out of tree driver, but does not appear
  to have caused any actual problems for in-tree code. A potential
  deadlock that was reported by lockdep. And a deadlock people have
  experienced and took the time to track down caused by a cleanup that
  removed the code to drop a reference count"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  sysctl: Drop reference added by grab_header in proc_sys_readdir
  pid: fix lockdep deadlock warning due to ucount_lock
  libfs: Modify mount_pseudo_xattr to be clear it is not a userspace mount
  mnt: Protect the mountpoint hashtable with mount_lock

1 files changed, 0 insertions, 2 deletions

diff --git a/trafgen_parser.y b/trafgen_parser.y
index 5281bf6..40cd311 100644
--- a/trafgen_parser.y
+++ b/trafgen_parser.y
@@ -43,9 +43,7 @@
 
 #define YYERROR_VERBOSE		0
 #define YYDEBUG			0
-#define YYENABLE_NLS		1
 #define YYLTYPE_IS_TRIVIAL	1
-#define ENABLE_NLS		1
 
 extern FILE *yyin;
 extern int yylex(void);