Merge branch 'master' into sbom

Author: yogeshhegde

source/linux/How_to_Guides/FAQ/How_to_work_with_SBOM.rst

@@ -31,7 +31,11 @@ If you require additional vulnerability information, follow these steps:
 
       INHERIT += "vex"
 
+<<<<<<< HEAD
 2. Build Yocto as per the build instructions in :ref:`Processor SDK - Building the SDK with Yocto <building-the-sdk-with-yocto>`.
+=======
+2. Build Yocto according to the build instructions in :ref:`Processor SDK - Building the SDK with Yocto <building-the-sdk-with-yocto>`.
+>>>>>>> master
 
 The following artifacts will be generated in the Yocto deploy directory:
 
@@ -66,7 +70,11 @@ To generate an SBOM in CycloneDX format, follow these steps:
 
       INHERIT += "cyclonedx-export"
 
+<<<<<<< HEAD
 4. Continue to build Yocto as per the build instructions in :ref:`Processor SDK - Building the SDK with Yocto <building-the-sdk-with-yocto>`.
+=======
+4. Continue to build Yocto according to the build instructions in :ref:`Processor SDK - Building the SDK with Yocto <building-the-sdk-with-yocto>`.
+>>>>>>> master
 
 The following artifacts will be generated in the Yocto deploy directory: