Hello, On Wed, Jul 30, 2014 at 10:20:38AM +0200, Antoine Ténart wrote: > How do you want me to send the series? There is two conflicts when > applying to libata/for-3.17: > - patch 4/8: it takes into account a patch not in libata/for-3.17 but > added before rc7. It should be better to first merge rc7, otherwise > some modifications won't make sense. > - patch 6/8: "fsl,imx53-ahci" was removed from the documentation in > libata/for-3.17 but not in rc7. Resolving the conflict is really > simple. > > I think it's better to apply the whole thing after merging rc7 into > libata/for-3.17, because it will only have a really simple conflict to > resolve. > > Please tell me what do you prefer before I send the updated version.
Hmmm... does pulling in libata/for-3.16-fixes into libata/for-3.17 resolves the conflict? If so, please send the patch on top of the merged branch. I wanna avoid pulling in -rc7 wholesale at this point. Thanks. -- tejun -- 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/
