Dear Scott,
In message 1404159636.2435.165.camel@snotra.buserror.net you wrote:
I agree that #ifdef's should be avoided, but then here they also serve a documentation purpose as they clearly mark areas of code that are specific to U-Boot, or that are not used in U-Boot.
git diff can do that too, without reducing readability or increasing the likelihood of mismerges.
(git) diff needs a reference to diff against. Maybe I missed some earlier comments about that, but how exactly should this be done here?
If we want to have strictly bisectable code in mainline, I don't really see how to provide an unmodified source reference to show the U-Boot specific diffs.
Can you please explain (maybe again, sorry) how you think the code update should be done do both allow such a git diff and remain bisectable? The ways I can see all require a non-working / non-com- piling intermediate step.
Best regards,
Wolfgang Denk