<div dir="ltr">I know you didn't test this: :)<br><div class="gmail_extra"><br><div class="gmail_quote">On 26 February 2018 at 14:38, Khem Raj <span dir="ltr"><<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">@@ -40,8 +40,13 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${<wbr>SRCBRANCH};name=glibc \<br>
file://0023-Define-DUMMY_<wbr>LOCALE_T-if-not-defined.patch \<br>
file://0024-elf-dl-deps.c-<wbr>Make-_dl_build_local_scope-<wbr>breadth-fir.patch \<br>
file://0025-locale-fix-hard-<wbr>coded-reference-to-gcc-E.patch \<br>
+<<<<<<< HEAD:meta/recipes-core/glibc/<a href="http://glibc_2.26.bb" rel="noreferrer" target="_blank">g<wbr>libc_2.26.bb</a><br>
file://0027-glibc-reset-dl-<wbr>load-write-lock-after-forking.<wbr>patch \<br>
file://0028-Bug-4578-add-ld.<wbr>so-lock-while-fork.patch \<br>
+=======<br>
+ file://0026-reset-dl_load_<wbr>write_lock-after-forking.patch \<br>
+ file://0027-Acquire-ld.so-<wbr>lock-before-switching-to-<wbr>malloc_atfork.patch \<br>
+>>>>>>> 2ce2695790... glibc: Upgrade to 2.27 release:meta/recipes-core/<wbr>glibc/<a href="http://glibc_2.27.bb" rel="noreferrer" target="_blank">glibc_2.27.bb</a><br>
"<br></blockquote><div><br></div><div>Locally I've got the previous 2.27 upgrade squashed into a revert of the 2.26 bump, presumably there are no other changes required?</div></div></div></div>