On Thu, Feb 01, 2018 at 06:46:46PM -0200, Eduardo Habkost wrote: > On Tue, Jan 16, 2018 at 01:42:14PM +0000, Daniel P. Berrange wrote: > > From: Miika S <miika9...@gmail.com> > > > > keycodemapdb updated to add the QKeyCodes muhenkan and katakanahiragana > > > > Signed-off-by: Miika S <miika9...@gmail.com> > > Oops, this conflicts with: > > commit ae6b06ab655b21c19b234ce3422f694d11a013e0 > Author: Daniel P. Berrange <berra...@redhat.com> > Date: Wed Jan 17 16:41:18 2018 +0000 > > hw: convert virtio-input-hid device to keycodemapdb > > [...] > > Patch 11/14 and 12/14 need to be redone. I'm removing patches > 11-14 from python-next until this is sorted out.
You can literally just drop the patch chunk which touches the hw/input/virtio-input-hid.c file entirely, as that table is now auto-generated. I can resend the series with that if you prefer though ? 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 :|
