Hi Nicolas, On Fri, 09 Sep 2011 11:53:35 +0200 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> wrote: > > So, as I am not so used to this kind of situation, I wonder if I need > to included those two patches from Russell's and Artem's git trees in > our at91-next one or if I only carry on with current patch series > until Linus merges all this himself? Just carry on, the conflicts will be fixed up When Linus merges your tree. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpUp99jix2Pg.pgp
Description: PGP signature
