Messages in this thread Patch in this message | | | Date | Wed, 17 Oct 2007 01:02:46 +0100 | From | Al Viro <> | Subject | [PATCH] fix adbhid mismerge |
| |
Something really odd has happened: the last couple of changesets have - int up_flag; + int keycode, up_flag; and - int up_flag; + int up_flag, key; in another, both in adb_input_keycode(). Even with -m passed to git-whatchanged there's no sign of anything in that area.
Aside of trivial conflict resolution (see below), what's the right way to trace the things like that? Linus?
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> --- diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index 8cce016..2766e4f 100644 --- a/drivers/macintosh/adbhid.c +++ b/drivers/macintosh/adbhid.c @@ -282,7 +282,7 @@ static void adbhid_input_keycode(int id, int scancode, int repeat) { struct adbhid *ahid = adbhid[id]; - int keycode, up_flag; + int keycode, up_flag, key; keycode = scancode & 0x7f; up_flag = scancode & 0x80; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |