From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 29 May 2013 13:13:20 +0000 (-0500)
Subject: Merge remote-tracking branch 'aneesh/for-upstream' into staging
X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~353
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=338ea905e948613607c98346e127fc9472c57f0d;p=qemu-upstream-4.5-testing.git

Merge remote-tracking branch 'aneesh/for-upstream' into staging

# By Aneesh Kumar K.V (3) and Gabriel de Perthuis (1)
# Via Aneesh Kumar K.V
* aneesh/for-upstream:
  hw/9pfs: Be robust against paths without FS_IOC_GETVERSION
  hw/9pfs: Use O_NOFOLLOW when opening files on server
  hw/9pfs: use O_NOFOLLOW for mapped readlink operation
  hw/9pfs: Fix segfault with 9p2000.u

Message-id: 87zjvevx4s.fsf@linux.vnet.ibm.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

338ea905e948613607c98346e127fc9472c57f0d