Re: linux-next: stackprotector tree build failure
- From
- Stephen Rothwell <sfr@canb.auug.org.au>
- Date
- Oct 22, 2008, 08:31 UTC
- Message-ID
- <20081022193113.20369b63.sfr@canb.auug.org.au>
- In-Reply-To
- <20081022192725.5f5de711.sfr@canb.auug.org.au>
On Wed, 22 Oct 2008 19:27:25 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
Show 5 quoted lines
> > I think rerere matches preimages on the SHA1 of the conflict (or its > reverse), so sufficiently similar pieces of code will match. I would > expect things like ext2/3/4 to be candidates. Did the traps_32.c one > match one for traps_64.c?
Or, of course similar conflicts in different merges in different branches of the same tree are really asking for it ...
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/