From: Gerd Hoffmann <kraxel@redhat.com>
To: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 1/3] Add dots keypresses support to the baum braille device
Date: Wed, 26 Oct 2016 14:37:14 +0200 [thread overview]
Message-ID: <1477485434.18984.49.camel@redhat.com> (raw)
In-Reply-To: <20161023195433.20102-2-samuel.thibault@ens-lyon.org>
On So, 2016-10-23 at 21:54 +0200, Samuel Thibault wrote:
> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Hmm, this one throws strange errors at me:
kraxel@nilsson ~/projects/qemu (queue/ui)# git am -3
~/Downloads/patches/input/\[PATCH_1_3
\]_Add_dots_keypresses_support_to_the_baum_braille_device.mbox
Applying: Add dots keypresses support to the baum braille device
Using index info to reconstruct a base tree...
M backends/baum.c
error: patch failed: backends/baum.c:1
error: backends/baum.c: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Hmm? How can that happen?
/me looks puzzled.
Cannot fall back to three-way merge.
Patch failed at 0001 Add dots keypresses support to the baum braille
device
cheers,
Gerd
next prev parent reply other threads:[~2016-10-26 12:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-23 19:54 [Qemu-devel] [PATCHv2 0/3] baum driver update v2 Samuel Thibault
2016-10-23 19:54 ` [Qemu-devel] [PATCH 1/3] Add dots keypresses support to the baum braille device Samuel Thibault
2016-10-26 12:37 ` Gerd Hoffmann [this message]
2016-10-26 15:14 ` Samuel Thibault
2016-10-27 11:29 ` Gerd Hoffmann
2016-10-23 19:54 ` [Qemu-devel] [PATCH 2/3] Defer BrlAPI tty acquisition to when guest starts using device Samuel Thibault
2016-10-23 19:54 ` [Qemu-devel] [PATCH 3/3] Move getting XWindow ID from baum driver to graphical backend Samuel Thibault
2016-10-26 10:17 ` Gerd Hoffmann
2016-10-26 11:35 ` Samuel Thibault
2016-10-26 12:24 ` Gerd Hoffmann
2016-10-30 15:24 ` Samuel Thibault
2016-11-01 10:03 ` Gerd Hoffmann
-- strict thread matches above, loose matches on Subject: below --
2016-10-23 18:47 [Qemu-devel] [PATCH 0/3] baum driver update Samuel Thibault
2016-10-23 18:47 ` [Qemu-devel] [PATCH 1/3] Add dots keypresses support to the baum braille device Samuel Thibault
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=1477485434.18984.49.camel@redhat.com \
--to=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=samuel.thibault@ens-lyon.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.