On Thu, Dec 17, 2015 at 12:42 PM, Burton, Ross <ross.bur...@intel.com> wrote: > > On 17 December 2015 at 20:30, Andre McCurdy <armccu...@gmail.com> wrote: >> >> It looks like you have some unresolved merge conflict markers in >> 0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch ? > > 0016, but yes, well spotted. Clearly nobody - myself included - reads the > logs. This just made it into master so I'll send a fix shortly.
Yes, I meant 0016, was just drafting an email to mention that! I was also going to mention that the conflict markers are in the manpages section of configure.ac, so probably got past sanity build testing etc because by default manpages are not enabled. > Ross -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
