* Tomi Valkeinen <tomi.valkeinen@xxxxxx> [160603 03:53]: > > > On 02/06/16 18:23, Tony Lindgren wrote: > > * Tomi Valkeinen <tomi.valkeinen@xxxxxx> [160602 05:28]: > >> > >> Tony, can you have a look at the arch/arm parts here and give your ack > >> if they're fine? They should be quite small and display specific, so I > >> don't see much chance for conflict there. > > > > Looks good to me, but these are going to conflict with the board-*.c > > removal patches. And those we want to have easily revertable in case > > of issues. > > > > Peter, can you do an immutable minimal branch of just the pdata > > changes affecting the board-*.c files? That way both Tomi and I > > can merge that in. > > I wonder how minimal it can be, as I think most of the patches are > needed for pdata changes. Well, Peter can tell better. Looks like Peter's new series deals with it just fine. > What board changes do you expect for the next merge window? If it's just > "git rm boardfile.c", that should be an easy conflict to resolve, right? Trivial but no need to create these merge conflicts here. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
