== Progress == * DEVPLAT-321 "clean up ILP32 build job" (0%): - closed. * CARD-788 "EPIC: Linux linaro baseline maintenance" (50%): - moved llct v4.0-rc7. A few issues in llct due to the android topic update to the aosp/android-3.18 resolved, but the others are arising. The last issue is Juno boot failure (kernel oops after starting avahi-daemon) - still working on that. No updates for ll - still waiting for the things in llct to settle down. * DEVPLAT-345 "ll-fold.sh script doesn't work correct with newer git versions" (50%): - testing revealed that git rerere is more flexible in recognizing known conflicts than ll-fold.sh implementation. The problem is that "git rerere"'s known conflicts and their resolutions aren't saved by ll-fold.sh (git saves them only locally), and they won't be available in a cloned repository. This may result in failure to reconstruct the tree using pinned manifest if using e.g. a freshly cloned git repo: ll-fold.sh itself may refuse to recognize a conflict to be known, and git rerere may not know this conflict yet too. (The workaround could be to reconstruct earlier snapshots first - so that ll-fold.sh applied the relevant solutions first time, and git rerere would care of applying them when reconstructing the later snapshots). The ARM's patches themselves look safe - they do address the types of the merge conflicts ever occurred during the whole llct and ll lifesycles.

== Plans == * CARD-788 "EPIC: Linux linaro baseline maintenance": - resolve the remaining issue(s?) in llct; update linux-linaro to v4.0. * DEVPLAT-345 "ll-fold.sh script doesn't work correct with newer git versions": - complete the card. Create a new one to address the issue with proper saving and sharing conflicts resolutions.

== Issues == * none