[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LNX.2.00.1511041030420.22567@pobox.suse.cz>
Date: Wed, 4 Nov 2015 10:32:24 +0100 (CET)
From: Jiri Kosina <jikos@...nel.org>
To: Dmitry Torokhov <dmitry.torokhov@...il.com>
cc: Petri Gynther <pgynther@...gle.com>, Arnd Bergmann <arnd@...db.de>,
linux-input <linux-input@...r.kernel.org>,
linux-kernel <linux-kernel@...r.kernel.org>,
linux-arm-kernel@...ts.infradead.org
Subject: Re: [PATCH] HID: hid-gfrm: avoid warning for input_configured API
change
On Tue, 3 Nov 2015, Dmitry Torokhov wrote:
> > > The input_configured callback was recently changed to return
> > > an 'int', but the newly added driver uses the old API:
> > >
> > > drivers/hid/hid-gfrm.c:151:22: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types]
> > >
> > > This changes the driver like the other ones.
> > >
> > > Signed-off-by: Arnd Bergmann <arnd@...db.de>
> >
> > Acked-by: Petri Gynther <pgynther@...gle.com>
>
> Hmm, the question is how to merge this, given that one change is in
> Jiri's tree and another in mine...
In this case probably the best course of action is you cherry-picking
b2c68a2f1bab from my tree into yours, and proceeding further. git can
handle doubled commits (that will end up in Linus' tree eventually)
easily.
Another option would be to create a joint merge tree that'd contain both
branches merged together and proceed further from that, but I don't think
it's worth the hassle for simple case like this.
Works for you?
Thanks,
--
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists