From: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu, 16 Feb 2012 00:40:26 +0000 (-0600)
Subject: Merge remote-tracking branch 'kiszka/queues/slirp' into staging
X-Git-Tag: pull-nvme-20200902~8503
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=006c891fc9d4f044ad3f41b6e019442523b45a54;p=qemu-nvme.git

Merge remote-tracking branch 'kiszka/queues/slirp' into staging

* kiszka/queues/slirp:
  slirp: Prevent sending ICMP error replies to source-only addresses
  slirp: Remove unused variable and unused code
---

006c891fc9d4f044ad3f41b6e019442523b45a54