From be622ae87e581762452cf7c18ff780c935bf53a2 Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Fri, 3 Dec 2010 08:32:23 -0800 Subject: [PATCH] documentation/kernel-manual/kernel-concepts.xml: Re-worded a note to state best practices for organizing shared features. Signed-off-by: Scott Rifenbark --- documentation/kernel-manual/kernel-concepts.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/documentation/kernel-manual/kernel-concepts.xml b/documentation/kernel-manual/kernel-concepts.xml index d2ebab0101..f26e2903eb 100644 --- a/documentation/kernel-manual/kernel-concepts.xml +++ b/documentation/kernel-manual/kernel-concepts.xml @@ -230,9 +230,11 @@ in question. - 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. BSP-specific code additions are handled in a similar manner to kernel-specific additions.