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.c...@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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
