From: Eduardo Habkost <ehabkost@redhat.com>
To: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: qemu-devel@nongnu.org, "Miika S" <miika9764@gmail.com>,
"Fam Zheng" <famz@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Markus Armbruster" <armbru@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: Re: [Qemu-devel] [PATCH v5 11/14] input: add missing JIS keys to virtio input
Date: Fri, 2 Feb 2018 12:52:19 -0200 [thread overview]
Message-ID: <20180202145219.GJ26425@localhost.localdomain> (raw)
In-Reply-To: <20180202131314.GF15403@redhat.com>
On Fri, Feb 02, 2018 at 01:13:14PM +0000, Daniel P. Berrangé wrote:
> 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 <miika9764@gmail.com>
> > >
> > > keycodemapdb updated to add the QKeyCodes muhenkan and katakanahiragana
> > >
> > > Signed-off-by: Miika S <miika9764@gmail.com>
> >
> > Oops, this conflicts with:
> >
> > commit ae6b06ab655b21c19b234ce3422f694d11a013e0
> > Author: Daniel P. Berrange <berrange@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 ?
I will do that when applying the patch. Thanks!
--
Eduardo
next prev parent reply other threads:[~2018-02-02 14:52 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-16 13:42 [Qemu-devel] [PATCH v5 00/14] Support building with py2 or py3 Daniel P. Berrange
2018-01-16 13:42 ` [Qemu-devel] [PATCH v5 01/14] qapi: convert to use python print function instead of statement Daniel P. Berrange
2018-01-16 13:42 ` [Qemu-devel] [PATCH v5 02/14] qapi: use items()/values() intead of iteritems()/itervalues() Daniel P. Berrange
2018-01-16 13:42 ` [Qemu-devel] [PATCH v5 03/14] qapi: Use OrderedDict from standard library if available Daniel P. Berrange
2018-01-16 13:42 ` [Qemu-devel] [PATCH v5 04/14] qapi: adapt to moved location of StringIO module in py3 Daniel P. Berrange
2018-01-16 13:42 ` [Qemu-devel] [PATCH v5 05/14] qapi: Adapt to moved location of 'maketrans' function " Daniel P. Berrange
2018-01-16 13:42 ` [Qemu-devel] [PATCH v5 06/14] qapi: remove '-q' arg to diff when comparing QAPI output Daniel P. Berrange
2018-02-09 23:39 ` Eric Blake
2018-02-10 6:27 ` Markus Armbruster
2018-02-12 16:45 ` Daniel P. Berrangé
2018-01-16 13:42 ` [Qemu-devel] [PATCH v5 07/14] qapi: ensure stable sort ordering when checking QAPI entities Daniel P. Berrange
2018-01-16 13:42 ` [Qemu-devel] [PATCH v5 08/14] qapi: force a UTF-8 locale for running Python Daniel P. Berrange
2018-01-16 14:45 ` Eric Blake
2018-01-16 13:42 ` [Qemu-devel] [PATCH v5 09/14] scripts: ensure signrom treats data as bytes Daniel P. Berrange
2018-01-16 13:42 ` [Qemu-devel] [PATCH v5 10/14] configure: allow use of python 3 Daniel P. Berrange
2018-01-16 14:51 ` Eric Blake
2018-01-16 13:42 ` [Qemu-devel] [PATCH v5 11/14] input: add missing JIS keys to virtio input Daniel P. Berrange
2018-01-16 14:54 ` Eric Blake
2018-02-01 20:46 ` Eduardo Habkost
2018-02-02 13:13 ` Daniel P. Berrangé
2018-02-02 14:52 ` Eduardo Habkost [this message]
2018-01-16 13:42 ` [Qemu-devel] [PATCH v5 12/14] ui: update keycodemapdb to get py3 fixes Daniel P. Berrange
2018-01-16 14:56 ` Eric Blake
2018-01-16 13:42 ` [Qemu-devel] [PATCH v5 13/14] travis: improve python version test coverage Daniel P. Berrange
2018-05-31 16:09 ` Philippe Mathieu-Daudé
2018-06-01 11:47 ` Daniel P. Berrangé
2018-05-31 20:17 ` Alex Bennée
2018-06-01 11:48 ` Daniel P. Berrangé
2018-01-16 13:42 ` [Qemu-devel] [PATCH v5 14/14] docker: change Fedora images to run with python3 Daniel P. Berrange
2018-01-19 17:09 ` [Qemu-devel] [PATCH v5 00/14] Support building with py2 or py3 Eduardo Habkost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180202145219.GJ26425@localhost.localdomain \
--to=ehabkost@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=miika9764@gmail.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.