On Thu, Apr 14, 2016 at 09:47:57AM +0100, Vladimir Murzin wrote: > Hi, > > On 01/04/16 15:02, Vladimir Murzin wrote: > > Hi, > > > > This patch series provides the basic support for running ucLinux on V2M-MPS2 > > platform. > > > > With these patches applied ucLinux can be run on both HW and FVP models > > with Cortex-M3/M4/M7 configurations. > > Any objection to get it merged? > > Sudeep Holla noticed that there is merge conflict against linux-next > with PIC32 uart (Makefile and serial_core.h), so should I provide > conflict resolution or do rebase on someone's branch? > > Anyway, I'd be glad to know how it should be processed further? This patchset should go through the arm-soc tree. Any conflicts resulting from a merge *after* your patchset is in the arm-soc tree is no longer your problem. So IOW, if your patchset applies to arm-soc and Arnd is ok to pick it, then everything is fine. -- Daniel -- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
