Hi Len, On Sun, 30 Nov 2008 23:11:50 -0500 (EST) Len Brown <lenb@xxxxxxxxxx> wrote: > > Your guess was correct -- the patch with the later commit time > was the correct one to keep. > > This was my pilot error. I updated the patch in my release tree > and so you got the updated patch via Linus. But I failed to update > my test tree, so you got the old patch from my test tree. > > I've just re-constituted my test branch, so the old patch is gone, > and with it this conflict. OK, thanks. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpHP6BpQBTgc.pgp
Description: PGP signature
