diff options
| author | Peter Maydell | 2018-08-20 10:48:03 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-08-20 10:48:03 +0200 |
| commit | adaec191bfb31e12d40af8ab1b869f5b40d61ee9 (patch) | |
| tree | 9a2b89fcf729fa1c4db7d4fd9331b921e97edff8 /linux-headers/linux/virtio_ring.h | |
| parent | Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20180817.0' i... (diff) | |
| parent | fw_cfg: ignore suffixes in the bootdevice list dependent on machine class (diff) | |
| download | qemu-adaec191bfb31e12d40af8ab1b869f5b40d61ee9.tar.gz qemu-adaec191bfb31e12d40af8ab1b869f5b40d61ee9.tar.xz qemu-adaec191bfb31e12d40af8ab1b869f5b40d61ee9.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging
Machine queue, 2018-08-17
* Allow machine classes to specify if boot device suffixes should
be ignored by get_boot_devices_list()
* Tiny coding style fixup
# gpg: Signature made Fri 17 Aug 2018 19:29:22 BST
# gpg: using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/machine-next-pull-request:
fw_cfg: ignore suffixes in the bootdevice list dependent on machine class
sysbus: always allow explicit_ofw_unit_address() to override address generation
machine: Fix coding style at machine_run_board_init()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-headers/linux/virtio_ring.h')
0 files changed, 0 insertions, 0 deletions