All of lore.kernel.org
 help / color / mirror / Atom feed
From: cw00.choi@samsung.com (Chanwoo Choi)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs
Date: Thu, 06 Feb 2014 11:24:21 +0900	[thread overview]
Message-ID: <52F2F255.90705@samsung.com> (raw)
In-Reply-To: <20140205140450.GE5196@lee--X1>

On 02/05/2014 11:04 PM, Lee Jones wrote:
>>> Following patch has conflict on extcon-next branch(Linus 3.14-rc1)
>>> when apply patchset by using git am.
>>>
>>> [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs
>>> [PATCH 12/18] extcon: max14577: Choose muic_irqs according to device type
>>> [PATCH 14/18] extcon: max14577: Add support for max77836
>>>
>>> The base commit of this patchset isn't mainline. You need to rebase this patchset 
>>> on extcon-next branch and please resend this patchset.
> 
> <snip>
> 
>> This patch patch (along with other) depends on previous rename patches
>> from this patchset:
>> [PATCH 07/18] mfd: max14577: Rename and add MAX14577 symbols to prepare
>> for max77836
>> http://article.gmane.org/gmane.linux.kernel/1636674
>>
>> I can resolve the conflict but then they will return on applying patch
>> 7/18.
>>
>> I think this patch may wait for a little until the rename-like patches
>> will be accepted.
>>
>> Can you ACK other patches touch extcon?
>>  - [PATCH 07/18] mfd: max14577: Rename and add MAX14577 symbols...
>>  - [PATCH 08/18] mfd: max14577: Rename state container to maxim_core
>>  - [PATCH 09/18] mfd: max14577: Add "muic" suffix to regmap and irq_chip
> 
> If you can obtain Acks for all of the patches, I can apply the entire
> patch-set to an immutable branch and issue a pull-request for the
> other maintainers to pull from.
> 

Hi Lee,

OK, I agree your opionion.
I'd like you to apply this patchset dependent on extcon subsytem
on your tree. I acked on following patchset and tested all of this patchset series.

Acked-by: Chanwoo Choi <cw00.choi@samsung.com>

[PATCH 06/18] extcon: max14577: Change extcon name instead of static name according to device type
- I will delete this patch([PATCH 06/18]) on extcon-next branch.
[PATCH 07/18] mfd: max14577: Rename and add MAX14577 symbols...
[PATCH 08/18] mfd: max14577: Rename state container to maxim_core
[PATCH 09/18] mfd: max14577: Add "muic" suffix to regmap and irq_chip

[PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs
[PATCH 12/18] extcon: max14577: Choose muic_irqs according to device type
[PATCH 14/18] extcon: max14577: Add support for max77836

Thanks,
Chanwoo Choi

WARNING: multiple messages have this Message-ID (diff)
From: Chanwoo Choi <cw00.choi@samsung.com>
To: Lee Jones <lee.jones@linaro.org>
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>,
	Samuel Ortiz <sameo@linux.intel.com>,
	linux-kernel@vger.kernel.org, Liam Girdwood <lgirdwood@gmail.com>,
	Kyungmin Park <kyungmin.park@samsung.com>,
	Mark Brown <broonie@kernel.org>,
	MyungJoo Ham <myungjoo.ham@samsung.com>,
	linux-arm-kernel@lists.infradead.org,
	Marek Szyprowski <m.szyprowski@samsung.com>
Subject: Re: [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs
Date: Thu, 06 Feb 2014 11:24:21 +0900	[thread overview]
Message-ID: <52F2F255.90705@samsung.com> (raw)
In-Reply-To: <20140205140450.GE5196@lee--X1>

On 02/05/2014 11:04 PM, Lee Jones wrote:
>>> Following patch has conflict on extcon-next branch(Linus 3.14-rc1)
>>> when apply patchset by using git am.
>>>
>>> [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs
>>> [PATCH 12/18] extcon: max14577: Choose muic_irqs according to device type
>>> [PATCH 14/18] extcon: max14577: Add support for max77836
>>>
>>> The base commit of this patchset isn't mainline. You need to rebase this patchset 
>>> on extcon-next branch and please resend this patchset.
> 
> <snip>
> 
>> This patch patch (along with other) depends on previous rename patches
>> from this patchset:
>> [PATCH 07/18] mfd: max14577: Rename and add MAX14577 symbols to prepare
>> for max77836
>> http://article.gmane.org/gmane.linux.kernel/1636674
>>
>> I can resolve the conflict but then they will return on applying patch
>> 7/18.
>>
>> I think this patch may wait for a little until the rename-like patches
>> will be accepted.
>>
>> Can you ACK other patches touch extcon?
>>  - [PATCH 07/18] mfd: max14577: Rename and add MAX14577 symbols...
>>  - [PATCH 08/18] mfd: max14577: Rename state container to maxim_core
>>  - [PATCH 09/18] mfd: max14577: Add "muic" suffix to regmap and irq_chip
> 
> If you can obtain Acks for all of the patches, I can apply the entire
> patch-set to an immutable branch and issue a pull-request for the
> other maintainers to pull from.
> 

Hi Lee,

OK, I agree your opionion.
I'd like you to apply this patchset dependent on extcon subsytem
on your tree. I acked on following patchset and tested all of this patchset series.

Acked-by: Chanwoo Choi <cw00.choi@samsung.com>

[PATCH 06/18] extcon: max14577: Change extcon name instead of static name according to device type
- I will delete this patch([PATCH 06/18]) on extcon-next branch.
[PATCH 07/18] mfd: max14577: Rename and add MAX14577 symbols...
[PATCH 08/18] mfd: max14577: Rename state container to maxim_core
[PATCH 09/18] mfd: max14577: Add "muic" suffix to regmap and irq_chip

[PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs
[PATCH 12/18] extcon: max14577: Choose muic_irqs according to device type
[PATCH 14/18] extcon: max14577: Add support for max77836

Thanks,
Chanwoo Choi


  reply	other threads:[~2014-02-06  2:24 UTC|newest]

Thread overview: 100+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-28 12:18 [PATCH 00/18] mfd: max14577: Add support for MAX77836 Krzysztof Kozlowski
2014-01-28 12:18 ` Krzysztof Kozlowski
2014-01-28 12:18 ` [PATCH 01/18] regulator: max14577: Remove unused state container definition Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-01-28 16:19   ` Mark Brown
2014-01-28 16:19     ` Mark Brown
2014-01-28 12:18 ` [PATCH 02/18] mfd: max14577: Remove unused enum max14577_irq_source Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-02-03  9:25   ` Lee Jones
2014-02-03  9:25     ` Lee Jones
2014-01-28 12:18 ` [PATCH 03/18] mfd: max14577: Remove not needed header inclusion Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-02-03  9:26   ` Lee Jones
2014-02-03  9:26     ` Lee Jones
2014-01-28 12:18 ` [PATCH 04/18] mfd: max14577: Add of_compatible to extcon mfd_cell Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-02-03  9:27   ` Lee Jones
2014-02-03  9:27     ` Lee Jones
2014-01-28 12:18 ` [PATCH 05/18] mfd: max14577: Use of_match_ptr() in i2c_driver Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-01-29 10:08   ` Krzysztof Kozlowski
2014-01-29 10:08     ` Krzysztof Kozlowski
2014-02-03  9:30   ` Lee Jones
2014-02-03  9:30     ` Lee Jones
2014-02-05 10:41     ` Krzysztof Kozlowski
2014-02-05 10:41       ` Krzysztof Kozlowski
2014-01-28 12:18 ` [PATCH 06/18] extcon: max14577: Change extcon name instead of static name according to device type Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-02-05  0:43   ` Chanwoo Choi
2014-02-05  0:43     ` Chanwoo Choi
2014-01-28 12:18 ` [PATCH 07/18] mfd: max14577: Rename and add MAX14577 symbols to prepare for max77836 Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-02-03  9:38   ` Lee Jones
2014-02-03  9:38     ` Lee Jones
2014-02-05 10:45     ` Krzysztof Kozlowski
2014-02-05 10:45       ` Krzysztof Kozlowski
2014-02-06  1:53   ` Chanwoo Choi
2014-02-06  1:53     ` Chanwoo Choi
2014-01-28 12:18 ` [PATCH 08/18] mfd: max14577: Rename state container to maxim_core Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-02-03  9:42   ` Lee Jones
2014-02-03  9:42     ` Lee Jones
2014-02-05 10:48     ` Krzysztof Kozlowski
2014-02-05 10:48       ` Krzysztof Kozlowski
2014-02-06  1:55   ` Chanwoo Choi
2014-02-06  1:55     ` Chanwoo Choi
2014-01-28 12:18 ` [PATCH 09/18] mfd: max14577: Add "muic" suffix to regmap and irq_chip Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-02-03  9:45   ` Lee Jones
2014-02-03  9:45     ` Lee Jones
2014-02-05 10:48     ` Krzysztof Kozlowski
2014-02-05 10:48       ` Krzysztof Kozlowski
2014-02-06  1:56   ` Chanwoo Choi
2014-02-06  1:56     ` Chanwoo Choi
2014-01-28 12:18 ` [PATCH 10/18] mfd: max14577: Add detection of device type Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-02-03  9:55   ` Lee Jones
2014-02-03  9:55     ` Lee Jones
2014-02-05 13:38     ` Krzysztof Kozlowski
2014-02-05 13:38       ` Krzysztof Kozlowski
2014-01-28 12:18 ` [PATCH 11/18] extcon: max14577: Add max14577 prefix to muic_irqs Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-02-05  0:47   ` Chanwoo Choi
2014-02-05  0:47     ` Chanwoo Choi
2014-02-05 10:40     ` Krzysztof Kozlowski
2014-02-05 10:40       ` Krzysztof Kozlowski
2014-02-05 14:04       ` Lee Jones
2014-02-05 14:04         ` Lee Jones
2014-02-06  2:24         ` Chanwoo Choi [this message]
2014-02-06  2:24           ` Chanwoo Choi
2014-01-28 12:18 ` [PATCH 12/18] extcon: max14577: Choose muic_irqs according to device type Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-01-28 12:18 ` [PATCH 13/18] mfd: max77836: Add max77836 support to max14577 driver Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-02-03 10:22   ` Lee Jones
2014-02-03 10:22     ` Lee Jones
2014-02-05 14:57     ` Krzysztof Kozlowski
2014-02-05 14:57       ` Krzysztof Kozlowski
2014-01-28 12:18 ` [PATCH 14/18] extcon: max14577: Add support for max77836 Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-02-03 10:23   ` Lee Jones
2014-02-03 10:23     ` Lee Jones
2014-01-28 12:18 ` [PATCH 15/18] regulator: max14577: Add support for max77836 regulators Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-01-28 16:25   ` Mark Brown
2014-01-28 16:25     ` Mark Brown
2014-02-03 10:24   ` Lee Jones
2014-02-03 10:24     ` Lee Jones
2014-01-28 12:18 ` [PATCH 16/18] charger: max14577: Add support for MAX77836 charger Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-02-03 10:26   ` Lee Jones
2014-02-03 10:26     ` Lee Jones
2014-02-03 11:30   ` Jenny Tc
2014-02-03 11:30     ` Jenny Tc
2014-02-05 12:49     ` Krzysztof Kozlowski
2014-02-05 12:49       ` Krzysztof Kozlowski
2014-01-28 12:18 ` [PATCH 17/18] power: max17040: Add ID for max77836 Fuel Gauge block Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski
2014-01-28 12:18 ` [PATCH 18/18] mfd: max14577: Add device tree bindings document Krzysztof Kozlowski
2014-01-28 12:18   ` Krzysztof Kozlowski

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=52F2F255.90705@samsung.com \
    --to=cw00.choi@samsung.com \
    --cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.