From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751474AbbCTI7z (ORCPT ); Fri, 20 Mar 2015 04:59:55 -0400 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 MIME-version: 1.0 Content-type: text/plain; charset=UTF-8 X-AuditID: cbfec7f4-b7f126d000001e9a-d0-550be0dc853d Content-transfer-encoding: 8BIT Message-id: <1426841986.13579.2.camel@AMDC1943> Subject: Re: linux-next: manual merge of the battery tree with the hid tree From: Krzysztof Kozlowski To: Stephen Rothwell Cc: Sebastian Reichel , Jiri Kosina , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jason Gerecke Date: Fri, 20 Mar 2015 09:59:46 +0100 In-reply-to: References: <20150320151110.02e10b33@canb.auug.org.au> X-Mailer: Evolution 3.10.4-0ubuntu2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrNLMWRmVeSWpSXmKPExsVy+t/xq7p3HnCHGpzdIGVxY/tLRovXLwwt pi3NsLi8aw6bxcGFbYwWW/deZbc4vbvEgd2j8cYNNo+ds+6ye0zpWMnisWlVJ5tH35ZVjB6f N8kFsEVx2aSk5mSWpRbp2yVwZaxfM5214C5fxclXB9kaGN9zdzFyckgImEjM/XWQGcIWk7hw bz1bFyMXh5DAUkaJ3knfGUESvAKCEj8m32PpYuTgYBaQlzhyKRskzCygLjFp3iJmiPrPjBL/ fy9lAqnhFdCX2PEhD6RGWMBb4v2ry+wgNpuAscTm5UvYQEpEBLQlDvwWAGllFljBKHHjxzQm kBoWAVWJnW92MoPUcAoES0y9Xg8SFhKolVh06A1YWEJAWaKx320Co8AsJLfNQrhtFpLbFjAy r2IUTS1NLihOSs811CtOzC0uzUvXS87P3cQICfAvOxgXH7M6xCjAwajEw/tzN3eoEGtiWXFl 7iFGCQ5mJRHeh9eBQrwpiZVVqUX58UWlOanFhxiZODilGhgdbaImXr52dFo5ayDXVoPT9/yM K73r3qjdNV1eXd9lrli1/tZuae5um0TppeF7rpvP17229BGb9qrcsOal63t8N059LPNyxZmn fC+uiXfsdZKu38CnvmvxoovmMkEd26L/M15VVhK3OSGn6hbOG+fB8OWCsAvjyaRryemf0xXt NbyOliwyWa3EUpyRaKjFXFScCAB6JW82TgIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On pią, 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 battery > > tree. > > > > I fixed it up (see below) and can carry the fix as necessary (no action > > 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 driver 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 = ps_connected; > > > > if (wacom->battery.dev) > > Should be: > if (wacom->battery) > > 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