Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932548AbbKDJc1 (ORCPT ); Wed, 4 Nov 2015 04:32:27 -0500 Received: from mx2.suse.de ([195.135.220.15]:49119 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755209AbbKDJcZ (ORCPT ); Wed, 4 Nov 2015 04:32:25 -0500 Date: Wed, 4 Nov 2015 10:32:24 +0100 (CET) From: Jiri Kosina X-X-Sender: jkosina@pobox.suse.cz To: Dmitry Torokhov cc: Petri Gynther , Arnd Bergmann , linux-input , linux-kernel , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] HID: hid-gfrm: avoid warning for input_configured API change In-Reply-To: <20151103234802.GC29032@dtor-ws> Message-ID: References: <14835877.IL6ArpWV8Q@wuerfel> <20151103234802.GC29032@dtor-ws> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1297 Lines: 38 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 > > > > Acked-by: Petri Gynther > > 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/