Hi Nicolas, On Tue, Jul 28, 2015 at 09:27:38AM +0200, Nicolas Ferre wrote: > >> This patch introduces a new compatible string: "atmel,sama5d3-rstc" and > >> new reset function for sama5d3 and later chips. > > > > queued. > > As my Device Tree changes depend on this modification, > we can synchronize in tree ways: Sorry for the delay. > 1/ you provide me a stable branch so that I can pull it before applying > my changes that can go through arm-soc. > > 2/ you let me take the driver's modifications with me and the two > patches of the series would go through arm-soc. > > 3/ you take the second patch of my series with my Acked-by tag and carry > both of them up to Linus' tree. I would be fine with all solutions, but 2/ would also require you handling another patch. I think your option 4/ is the best: > Okay, so to ease synchronization, I take this one with me through > arm-soc and add the old compatibility string as a fallback => the > newer will be used when merged... FWIW: Acked-By: Sebastian Reichel <sre@xxxxxxxxxx> -- Sebastian
Attachment:
signature.asc
Description: Digital signature
