1. 22 7月, 2016 37 次提交
  2. 21 7月, 2016 3 次提交
    • P
      Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-07-21-1' into staging · 7239247a
      Peter Maydell 提交于
      Merge qcrypto-next 2016/07/21 v1
      
      # gpg: Signature made Thu 21 Jul 2016 11:07:36 BST
      # gpg:                using RSA key 0xBE86EBB415104FDF
      # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
      # gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
      # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF
      
      * remotes/berrange/tags/pull-qcrypto-2016-07-21-1:
        crypto: don't open-code qcrypto_hash_supports
        crypto: use glib as fallback for hash algorithm
        crypto: use /dev/[u]random as a final fallback random source
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      7239247a
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging · 61ead113
      Peter Maydell 提交于
      Pull request
      
      v2:
       * Resolved merge conflict with block/iscsi.c [Peter]
      
      # gpg: Signature made Wed 20 Jul 2016 17:20:52 BST
      # gpg:                using RSA key 0x9CA4ABB381AB73C8
      # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
      # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
      # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8
      
      * remotes/stefanha/tags/block-pull-request: (25 commits)
        raw_bsd: Convert to byte-based interface
        nbd: Convert to byte-based interface
        block: Kill .bdrv_co_discard()
        sheepdog: Switch .bdrv_co_discard() to byte-based
        raw_bsd: Switch .bdrv_co_discard() to byte-based
        qcow2: Switch .bdrv_co_discard() to byte-based
        nbd: Switch .bdrv_co_discard() to byte-based
        iscsi: Switch .bdrv_co_discard() to byte-based
        gluster: Switch .bdrv_co_discard() to byte-based
        blkreplay: Switch .bdrv_co_discard() to byte-based
        block: Add .bdrv_co_pdiscard() driver callback
        block: Convert .bdrv_aio_discard() to byte-based
        rbd: Switch rbd_start_aio() to byte-based
        raw-posix: Switch paio_submit() to byte-based
        block: Convert BB interface to byte-based discards
        block: Convert bdrv_aio_discard() to byte-based
        block: Switch BlockRequest to byte-based
        block: Convert bdrv_discard() to byte-based
        block: Convert bdrv_co_discard() to byte-based
        iscsi: Rely on block layer to break up large requests
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      
      Conflicts:
      	block/gluster.c
      61ead113
    • P
      Revert e5dfc5e8("Move README to markdown") · b95aae12
      Pranith Kumar 提交于
      checkpatch.pl and other scripts fail without README. Revert
      the rename for now; we may add README.md as a symlink later.
      
      This reverts commit e5dfc5e8.
      Signed-off-by: NPranith Kumar <bobby.prani@gmail.com>
      Reviewed-by: NStefan Weil <sw@weilnetz.de>
      Message-id: 20160720203131.30229-2-bobby.prani@gmail.com
      [PMM: tweaked commit message a little]
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      b95aae12