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.

--
Sebastian Huber, embedded brains GmbH

Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone   : +49 89 189 47 41-16
Fax     : +49 89 189 47 41-09
E-Mail  : sebastian.hu...@embedded-brains.de
PGP     : Public key available on request.

Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.

_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Reply via email to