Re: linux-next: stackprotector tree build failure
From: Stephen Rothwell <hidden>
Date: 2016-06-15 22:45:31
Also in:
git
On Wed, 22 Oct 2008 19:27:25 +1100 Stephen Rothwell [off-list ref] wrote:
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/
Attachments
- (unnamed) [application/pgp-signature] 197 bytes