On Thu, Jan 25, 2018 at 04:29:23PM +0100, Gerd Hoffmann wrote: > On Mon, Jan 15, 2018 at 03:32:33PM +0000, Daniel P. Berrange wrote: > > On Mon, Jan 15, 2018 at 04:18:53PM +0100, Gerd Hoffmann wrote: > > > Hi, > > > > > > > Miika S (3): > > > > input: add mouse side buttons to virtio input > > > > input: virtio: don't send mouse wheel event twice > > > > > > Cherry-picked these two ad the kbd update depends on the not-yet merged > > > keycodemapdb update for virtio-keyboard. > > > > It is merged actually in, so you can include the keycode fix too: > > > > https://git.qemu.org/gitweb.cgi?p=keycodemapdb.git;a=commit;h=05dad417e9d0b37ee1fba33056d91a6b734b3357 > > To be exact: it conflicts (and I think also is obsoleted by) your patch > "hw: convert virtio-input-hid device to keycodemapdb".
That patch doesn't touch keycodemapdb. I did obsolete it though in an unrelated series: https://lists.gnu.org/archive/html/qemu-devel/2018-01/msg03528.html You should be fine to just include all 3 of the patches in this series, if you do a pull request for this series, before that py3 series gets pulled. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
