Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging
commit473a321122fd3c2c327a5a5d01a9a41f26f1734c
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 10 Aug 2017 16:50:55 +0000 (10 17:50 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 10 Aug 2017 16:50:55 +0000 (10 17:50 +0100)
tree31dc8f1adcd726b7a08d92c057a6ee91d15a88f0
parentb38df311c174c98ef8cce7dec9f46603b083018e
parent4751fd5328dfcd4fe2f9055728a72a0e3ae56512
Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging

Just a single fix for an annoying regression introduced in 2.9 when fixing
CVE-2016-9602.

# gpg: Signature made Thu 10 Aug 2017 13:40:28 BST
# gpg:                using DSA key 0x02FC3AEB0101DBC2
# gpg: Good signature from "Greg Kurz <groug@kaod.org>"
# gpg:                 aka "Greg Kurz <groug@free.fr>"
# gpg:                 aka "Greg Kurz <gkurz@linux.vnet.ibm.com>"
# gpg:                 aka "Gregory Kurz (Groug) <groug@free.fr>"
# gpg:                 aka "[jpeg image of size 3330]"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 2BD4 3B44 535E C0A7 9894  DBA2 02FC 3AEB 0101 DBC2

* remotes/gkurz/tags/for-upstream:
  9pfs: local: fix fchmodat_nofollow() limitations

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>