Am Freitag, 1. August 2014, 13:26:43 schrieb Jaehoon Chung: > Hi, All. > > It seems too late that this patch-set is merged into linux-3.16. > Also there are some conflicts in device-tree. (I will remove the conflicts) > So if everybody is ok, I will rebase on linux-next after released > linux-3.16. At that time, i will send this patch-set to stable kernel, too. > how about? > And I want to know who can apply this patch-set(#3~#5). I guess each SoC maintainer could take the changes to their work-area, once the core changes have landed in the mmc tree. So I would take the Rockchip patch, Kukjin the Exynos one and Dinh the socfpga patch. Heiko > > Best Regards, > Jaehoon Chung > > On 08/01/2014 03:36 AM, Kukjin Kim wrote: > > On 08/01/14 01:02, Doug Anderson wrote: > >> Jaehoon > >> > >> On Wed, Jul 30, 2014 at 10:35 PM, Jaehoon Chung<jh80.chung@xxxxxxxxxxx> wrote: > >>> Slot quirks "disable-wp" is deprecated. > >>> Instead, use the host quirk "disable-wp". > >>> (Because the slot-node is removed in dt-file.) > >>> > >>> Signed-off-by: Jaehoon Chung<jh80.chung@xxxxxxxxxxx> > >>> Tested-by: Sachin Kamat<sachin.kamat@xxxxxxxxxxx> > >>> Acked-by: Seungwon Jeon<tgih.jun@xxxxxxxxxxx> > >>> --- > >>> > >>> drivers/mmc/host/dw_mmc.c | 11 +++++++++-- > >>> include/linux/mmc/dw_mmc.h | 2 ++ > >>> 2 files changed, 11 insertions(+), 2 deletions(-) > >> > >> Thanks for taking my suggestion and making it backward compatible. > >> This looks great to me. It tested this in both the backward > >> compatible way (with the warning) and the non-backward compatible way. > >> I think we should land and patch #2 ASAP and then we can land the rest > >> of the series as SoC maintainers see fit. > > > > Yes, right if we don't want to see useless merge conflicts... > > > > When I sent ack on exynos stuff, there was no conflict with my tree but > > happens it now. > > > > - Kukjin > > > >> Reviewed-by: Doug Anderson<dianders@xxxxxxxxxxxx> > >> Tested-by: Doug Anderson<dianders@xxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html