From mboxrd@z Thu Jan 1 00:00:00 1970 From: Krzysztof Kozlowski Subject: Re: linux-next: manual merge of the battery tree with the hid tree Date: Fri, 20 Mar 2015 09:59:46 +0100 Message-ID: <1426841986.13579.2.camel@AMDC1943> References: <20150320151110.02e10b33@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mailout1.w1.samsung.com ([210.118.77.11]:61766 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750916AbbCTI7v (ORCPT ); Fri, 20 Mar 2015 04:59:51 -0400 In-reply-to: Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Sebastian Reichel , Jiri Kosina , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jason Gerecke On pi=C4=85, 2015-03-20 at 08:58 +0100, Krzysztof Kozlowski wrote: > 2015-03-20 5:11 GMT+01:00 Stephen Rothwell : > > Hi Sebastian, > > > > Today's linux-next merge of the battery tree got conflicts in > > drivers/hid/wacom.h and drivers/hid/wacom_sys.c between commit > > 953f2c5f7163 ("HID: wacom: Centralize updating of wacom_wac battery > > status") and fce9957d8f61 ("HID: wacom: Allow dynamic battery > > creation/destruction") from the hid tree and commit 297d716f6260 > > ("power_supply: Change ownership from driver to core") from the bat= tery > > tree. > > > > I fixed it up (see below) and can carry the fix as necessary (no ac= tion > > is required). I also applied the following merge fixup patch. > > > > From: Stephen Rothwell > > Date: Fri, 20 Mar 2015 14:59:36 +1100 > > Subject: [PATCH] HID: wacom: merge fix for "Change ownership from d= river to core" > > > > Signed-off-by: Stephen Rothwell > > --- > > drivers/hid/wacom_wac.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c > > index 5588ba80ede9..57ee0d807af1 100644 > > --- a/drivers/hid/wacom_wac.c > > +++ b/drivers/hid/wacom_wac.c > > @@ -62,7 +62,7 @@ static void wacom_notify_battery(struct wacom_wac= *wacom_wac, > > wacom_wac->ps_connected =3D ps_connected; > > > > if (wacom->battery.dev) >=20 > Should be: > if (wacom->battery) >=20 > Rest of patch looks fine but indeed some more changes are required. Actually after looking at current next this Stephen's merge resolution is sufficient for HID. I did not find any more issues. After that s/battery.dev/battery/ change: Reviewed-by: Krzysztof Kozlowski Thanks Stephen for fixing! Best regards, Krzysztof