linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Sebastian Reichel <sre@kernel.org>, Jiri Kosina <jikos@jikos.cz>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jason Gerecke <killertofu@gmail.com>
Subject: Re: linux-next: manual merge of the battery tree with the hid tree
Date: Fri, 20 Mar 2015 09:59:46 +0100	[thread overview]
Message-ID: <1426841986.13579.2.camel@AMDC1943> (raw)
In-Reply-To: <CAJKOXPer=oM98UwobA9SmiE9cjk3BUqkJVzcHQLVTBdVzwYd7w@mail.gmail.com>

On pią, 2015-03-20 at 08:58 +0100, Krzysztof Kozlowski wrote:
> 2015-03-20 5:11 GMT+01:00 Stephen Rothwell <sfr@canb.auug.org.au>:
> > 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 <sfr@canb.auug.org.au>
> > 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 <sfr@canb.auug.org.au>
> > ---
> >  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 <k.kozlowski@samsung.com>

Thanks Stephen for fixing!

Best regards,
Krzysztof

      reply	other threads:[~2015-03-20  8:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-20  4:11 linux-next: manual merge of the battery tree with the hid tree Stephen Rothwell
2015-03-20  7:58 ` Krzysztof Kozlowski
2015-03-20  8:59   ` Krzysztof Kozlowski [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1426841986.13579.2.camel@AMDC1943 \
    --to=k.kozlowski@samsung.com \
    --cc=jikos@jikos.cz \
    --cc=killertofu@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=sre@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).