Re: [PATCH v5 0/9] mfd: max14577: Add support for MAX77836

[Chanwoo Choi]

On Wed, Apr 16, 2014 at 9:17 PM, Lee Jones <lee.jones@xxxxxxxxxx> wrote:
>> >>>>> This is first part of fifth version of patchset adding support for
>> >>>>> MAX77836 device to the max14577 driver.
>> >>>>>
>> >>>>> I decided to split the patchset into smaller parts. I hope this would
>> >>>>> help in getting necessary review/acks from maintainers.
>> >>>>>
>> >>>>> The first part introduces changes in max14577 driver and adds support
>> >>>>> for MAX77836 in MFD, extcon and regulator drivers. Most of these
>> >>>>> patches already have required acks from maintainers.
>> >>>>> Full v4 patchset can be found here:
>> >>>>> http://thread.gmane.org/gmane.linux.kernel/1654267
>> >>>>
>> >>>> So what's the plan for this driver now? What's missing? Do you have
>> >>>> all the Acks you need? If so, I'm happy to apply this patch-set and
>> >>>> supply a pull-request to the other maintainers.
>> >>>
>> >>> Next patches (part 2):
>> >>> 1. charger: max14577: Add support for MAX77836 charger
>> >>> 2. power: max17040: Add ID for MAX77836 Fuel Gauge block
>> >>> 3. regulator/mfd: max14577: Export symbols for calculating charger
>> >>>    current
>> >>> 4. charger: max14577: Configure battery-dependent settings from DTS
>> >>> 5. Documentation: mfd: max14577: Add device tree bindings document
>> >>> 6. regulator: max14577: Implement SUSPEND mode for MAX77836 LDO-s
>> >>>
>> >>> They are quite independent from each other so I think it would be the
>> >>> best if you could prepare an immutable branch with first part of
>> >>> patches.
>> >>
>> >> I have to modify all extcon device drivers for some reason,
>> >> If your patchset including extcon patch apply other git repository,
>> >> this patchset may have potential merge conflict.
>> >>
>> >> If you possible, following patchset would divide two patchset for each mfd/extcon
>> >> to remove potential merge conflict in 3.15 merge window.
>> >> - [PATCH v5 0/9] mfd: max14577: Add support for MAX77836
>> >
>> > I think we can resolve this after preparing by Lee the immutable branch
>> > with this patches. You could pull it so your changes to extcon-max14577
>> > would be on newest version.
>>
>> I'm reluctant for your suggestion.
>
> Do you know what the suggestion is?
>
>> IMO, If Lee agree, I'd like to apply this patchset on extcon git
>> after getting ack for all patchset from maintainer.
>
> This won't work. It _will_ cause conflicts when Extcon and MFD are
> merged. The only way to solve this is to create an immutable branch.

OK,
If you make some branch for this patchset, I'll pull it on extcon branch.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/