From: Peter Maydell Date: Fri, 7 Jun 2019 13:53:00 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190607-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9021fcfb883a17908a74a0ba1c09ff3b1bf97ebb;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190607-pull-request' into staging curses: 32bit build fix. egl: dmabuf modifier support. # gpg: Signature made Fri 07 Jun 2019 14:18:41 BST # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " [full] # gpg: aka "Gerd Hoffmann " [full] # gpg: aka "Gerd Hoffmann (private) " [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/ui-20190607-pull-request: egl-helpers: add modifier support to egl_dmabuf_import_texture() egl-helpers: add modifier support to egl_get_fd_for_texture(). vfio/display: set dmabuf modifier field console: add dmabuf modifier field. ui/curses: Fix build with -m32 Signed-off-by: Peter Maydell --- 9021fcfb883a17908a74a0ba1c09ff3b1bf97ebb