lkml.org 
[lkml]   [2015]   [Nov]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [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@arndb.de>
> >
> > Acked-by: Petri Gynther <pgynther@google.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



\
 
 \ /
  Last update: 2015-11-04 11:01    [W:0.047 / U:1.116 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site