Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "A set of fixes for this series. This contains:

   - Set of fixes for the nvme target code

   - A revert of patch from this merge window, causing a regression with
     WRITE_SAME on iSCSI targets at least.

   - A fix for a use-after-free in the new O_DIRECT bdev code.

   - Two fixes for the xen-blkfront driver"

* 'for-linus' of git://git.kernel.dk/linux-block:
  Revert "sd: remove __data_len hack for WRITE SAME"
  nvme-fc: use blk_rq_nr_phys_segments
  nvmet-rdma: Fix missing dma sync to nvme data structures
  nvmet: Call fatal_error from keep-alive timout expiration
  nvmet: cancel fatal error and flush async work before free controller
  nvmet: delete controllers deletion upon subsystem release
  nvmet_fc: correct logic in disconnect queue LS handling
  block: fix use after free in __blkdev_direct_IO
  xen-blkfront: correct maximum segment accounting
  xen-blkfront: feature flags handling adjustments

1 files changed, 0 insertions, 2 deletions

diff --git a/bpf_parser.y b/bpf_parser.y
index 73ab099..4e50a94 100644
--- a/bpf_parser.y
+++ b/bpf_parser.y
@@ -38,9 +38,7 @@ static char *labels_k[BPF_MAXINSNS];
 
 #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);