On 8/8/19 8:59 AM, Trevor Gamblin wrote:
file://0001-Fix-swapping-fake-lines-in-pch_swap.patch \
+<<<<<<< HEAD
+=======
+file://CVE-2019-13636.patch \
+file://0001-Invoke-ed-directly-instead-of-using-the-shell.patch \
+>>>>>>> 982b946... patch: fix CVE-2019-13638
"
Oops. The cherry-pick from master didn't go well.
Please fix and send a v2.
--
# Randy MacLeod
# Wind River Linux
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
