[U-Boot] [PATCH v4 0/3] mtd, ubi, ubifs: resync with Linux-3.14

Scott Wood
2014-06-30T20:20:36Z

On Thu, 2014-06-26 at 09:51 +0200, Wolfgang Denk wrote:
> Dear Scott,
>
> In message <1403637570.26908.38.camel@snotra.buserror.net> you wrote:
> >
> > I still disagree with #ifndef __UBOOT__ as it will hurt more than it
> > helps with future merges.
>
> 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.

> Do you think just of a removal, so there will be no trace left of
> which code was added for U-Boot, and which was removed? Or should
> these be turned into comments, something like
>
> /* BEGIN U-Boot specific code */
> ...
> /* END U-Boot specific code */
>
> [but that would not handle code removal well].
>
> So what exactly is your proposal how the #fdef's should be removed?

My proposal is to just remove them, similar to how the NAND code has
been handled.

-Scott