[PATCH 1/2] jffs2: Do not use command line defines

Chris Johns chrisj at rtems.org
Wed Mar 28 20:39:49 UTC 2018


On 28/03/2018 15:57, Sebastian Huber wrote:
> On 28/03/18 01:01, Chris Johns wrote:
>> On 27/03/2018 22:01, Sebastian Huber wrote:
>>> Update #3375.
>>> ---
>>>   cpukit/libfs/Makefile.am                  | 2 --
>>>   cpukit/libfs/src/jffs2/src/build.c        | 2 ++
>>>   cpukit/libfs/src/jffs2/src/compat-crc32.c | 2 ++
>>>   cpukit/libfs/src/jffs2/src/compr.c        | 2 ++
>>>   cpukit/libfs/src/jffs2/src/compr_rtime.c  | 2 ++
>>>   cpukit/libfs/src/jffs2/src/compr_rubin.c  | 2 ++
>>>   cpukit/libfs/src/jffs2/src/compr_zlib.c   | 2 ++
>>>   cpukit/libfs/src/jffs2/src/debug.c        | 2 ++
>>>   cpukit/libfs/src/jffs2/src/dir-rtems.c    | 2 ++
>>>   cpukit/libfs/src/jffs2/src/erase.c        | 2 ++
>>>   cpukit/libfs/src/jffs2/src/flashio.c      | 2 ++
>>>   cpukit/libfs/src/jffs2/src/fs-rtems.c     | 2 ++
>>>   cpukit/libfs/src/jffs2/src/gc.c           | 2 ++
>>>   cpukit/libfs/src/jffs2/src/jffs2-config.h | 2 ++
>>>   cpukit/libfs/src/jffs2/src/malloc-rtems.c | 2 ++
>>>   cpukit/libfs/src/jffs2/src/nodelist.c     | 2 ++
>>>   cpukit/libfs/src/jffs2/src/nodemgmt.c     | 2 ++
>>>   cpukit/libfs/src/jffs2/src/read.c         | 2 ++
>>>   cpukit/libfs/src/jffs2/src/readinode.c    | 2 ++
>>>   cpukit/libfs/src/jffs2/src/scan.c         | 2 ++
>>>   cpukit/libfs/src/jffs2/src/write.c        | 2 ++
>> Does this change diverge the code from the up stream?
> 
> Yes, but this is not a problem. Merge conflicts from upstream are trivially to
> resolve in this area.
> 

Sure, so we allow this sort of change to 3rd party source?

Chris




More information about the devel mailing list