On 26 January 2018 at 09:13, Gerd Hoffmann <kra...@redhat.com> wrote: > The following changes since commit 2077fef91d5eb8e3745a84fabd87a5ee7d2b535d: > > Merge remote-tracking branch > 'remotes/pmaydell/tags/pull-target-arm-20180125' into staging (2018-01-25 > 17:04:47 +0000) > > are available in the git repository at: > > git://git.kraxel.org/qemu tags/input-20180126-pull-request > > for you to fetch changes up to d0b610a55b81bdc485c877ef0466895fd40e8d6f: > > hw: convert virtio-input-hid device to keycodemapdb (2018-01-26 07:15:07 > +0100) > > ---------------------------------------------------------------- > input: switch devices to keycodemapdb, bugfixes. > > ----------------------------------------------------------------
This has a bunch of merge conflicts in the keycode map stuff. I could probably fix them up, but I'm just going to ask you to rebase instead, please. thanks -- PMM
