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@xxxxxxxx> > > > > Acked-by: Petri Gynther <pgynther@xxxxxxxxxx> > > 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-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
