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, 1 insertions, 1 deletions

diff --git a/llmnr-query.c b/llmnr-query.c
index 7e72836..d2fda6b 100644
--- a/llmnr-query.c
+++ b/llmnr-query.c
@@ -333,7 +333,7 @@ int main(int argc, char **argv)
 				char addr[INET6_ADDRSTRLEN];
 				uint16_t type, clss, addr_size;
 				uint32_t ttl;
-				char *name;
+				const char *name;
 				int af;
 
 				/* compression? */