From: Sebastian Reichel <sre@kernel.org>
To: Hans de Goede <hdegoede@redhat.com>,
MyungJoo Ham <myungjoo.ham@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>
Cc: Takashi Iwai <tiwai@suse.de>, Liam Breck <liam@networkimprov.net>,
Tony Lindgren <tony@atomide.com>,
linux-pm@vger.kernel.org
Subject: Re: [PATCH v5 1/2] power: supply: bq24190_charger: Use new extcon_register_notifier_all()
Date: Fri, 14 Apr 2017 01:44:48 +0200 [thread overview]
Message-ID: <20170413234448.stxmxvnemldzjyq3@earth> (raw)
In-Reply-To: <20170413233526.ebtytz54d3ux2oze@earth>
[-- Attachment #1: Type: text/plain, Size: 1539 bytes --]
Hi,
On Fri, Apr 14, 2017 at 01:35:26AM +0200, Sebastian Reichel wrote:
> Hi,
>
> On Thu, Apr 13, 2017 at 02:04:11PM +0200, Hans de Goede wrote:
> > When I submitted the extcon handling I had a patch pending for the
> > extcon sub-system for extcon_register_notifier to take -1 as cable id
> > for listening for all type cable events on an extcon with a single
> > notifier.
> >
> > In the end it was decided to instead add a new
> > extcon_register_notifier_all function for this, switch to using this.
> >
> > Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> > Acked-by: Liam Breck <kernel@networkimprov.net>
>
> With extcon_register_notifier_all() being new and not available
> in my tree I can't simply queue this patch. Also it can't simply
> go through the extcon subsystem, since it depends on changes in
> the power-supply subsystem and results in non-trivial merge conflict.
> I see three merge solutions:
>
> 1. Defer to 4.13 (since we are already quite near the merge window)
> 2. I need a immutable branch with extcon_register_notifier_all()
> from the extcon subsystem
> 3. It may count as Fix and could be queued during the 4.12-rc
> phase based von 4.12-rc1
Sorry for the noise, I just saw the immutable branch in the cover
mail. I will queue this now. Unfortunately it means rebasing the
power-supply tree to 4.11-rc4 (or ugly merge, which is annoying
in the pull-request). Chanwoo, please try to use -rc1 as base for
immutable branches in the future.
-- Sebastian
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2017-04-13 23:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-13 12:04 [PATCH v5 0/2] power: supply: bq24190_charger: Pending patches Hans de Goede
2017-04-13 12:04 ` [PATCH v5 1/2] power: supply: bq24190_charger: Use new extcon_register_notifier_all() Hans de Goede
2017-04-13 23:35 ` Sebastian Reichel
2017-04-13 23:44 ` Sebastian Reichel [this message]
2017-04-14 1:15 ` Chanwoo Choi
2017-04-13 12:04 ` [PATCH v5 2/2] power: supply: bq24190_charger: Do not reset the charger on probe by default Hans de Goede
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=20170413234448.stxmxvnemldzjyq3@earth \
--to=sre@kernel.org \
--cc=cw00.choi@samsung.com \
--cc=hdegoede@redhat.com \
--cc=liam@networkimprov.net \
--cc=linux-pm@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=tiwai@suse.de \
--cc=tony@atomide.com \
/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