Hi Anthony, Any update on this pull request ? You have merged the MAINTAINERS file update separately. But that conflict should be easy to fix.
-anesh On Mon, 30 Jan 2012 21:44:33 +0530, "Aneesh Kumar K.V" <aneesh.ku...@linux.vnet.ibm.com> wrote: > > Hi Anthony, > > I now have a successful build at build bot. So hopefully build breakage > is gone. I also added "remove O_NOATIME" patch which Mohan acked. > > -anees > > The following changes since commit 8c4ec5c0269bda18bb777a64b2008088d1c632dc: > > pxa2xx_keypad: fix unbalanced parenthesis. (2012-01-17 02:14:42 +0100) > > are available in the git repository at: > > git://github.com/kvaneesh/QEMU.git for-upstream > > for you to fetch changes up to eed968607d656a218712df47a5e0432c21fd6994: > > hw/9pfs: Remove O_NOATIME flag from 9pfs open() calls in readonly mode > (2012-01-30 10:54:17 +0530) > > ---------------------------------------------------------------- > (from the branch description for for-upstream local branch) > > branch for landing changes for upstream merge > > ---------------------------------------------------------------- > Aneesh Kumar K.V (3): > hw/9pfs: Add new security model mapped-file. > hw/9pfs: Fix crash when mounting with synthfs > hw/9pfs: Update MAINTAINERS file > > Daniel P. Berrange (1): > hw/9pfs: Remove O_NOATIME flag from 9pfs open() calls in readonly mode > > M. Mohan Kumar (2): > hw/9pfs: Preserve S_ISGID > fsdev: Fix parameter parsing for proxy helper > > MAINTAINERS | 6 +- > fsdev/file-op-9p.h | 12 +- > fsdev/virtfs-proxy-helper.c | 10 +- > hw/9pfs/cofile.c | 14 ++ > hw/9pfs/virtio-9p-device.c | 9 - > hw/9pfs/virtio-9p-handle.c | 4 +- > hw/9pfs/virtio-9p-local.c | 357 > ++++++++++++++++++++++++++++++++++++++++++- > hw/9pfs/virtio-9p.c | 3 +- > qemu-options.hx | 18 ++- > 9 files changed, 397 insertions(+), 36 deletions(-) >
