[poky] [PATCH 2/3] documentation/kernel-manual/kernel-concepts.xml: Re-worded a note to state best practices for organizing shared features.

Scott Rifenbark scott.m.rifenbark at intel.com
Fri Dec 3 08:32:23 PST 2010


Signed-off-by: Scott Rifenbark <scott.m.rifenbark at intel.com>
---
 documentation/kernel-manual/kernel-concepts.xml |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/documentation/kernel-manual/kernel-concepts.xml b/documentation/kernel-manual/kernel-concepts.xml
index d2ebab0..f26e290 100644
--- a/documentation/kernel-manual/kernel-concepts.xml
+++ b/documentation/kernel-manual/kernel-concepts.xml
@@ -230,9 +230,11 @@
                 in question.
             </para>
             <note><para>
-                This practice is not typically encouraged.
-                However, during development cycles or when large features are merged the practice
-                can't be avoided.
+                The Yocto Project team strives to place features in the tree such that they can be 
+                shared by all boards and kernel types where possible.
+                However, during development cycles or when large features are merged this practice 
+                cannot always be followed. 
+                In those cases isolated branches are used for feature merging.
             </para></note>
             <para>
                 BSP-specific code additions are handled in a similar manner to kernel-specific additions. 
-- 
1.7.0.4




More information about the poky mailing list