diff options
Diffstat (limited to 'documentation')
| -rw-r--r-- | 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 d2ebab0101..f26e2903eb 100644 --- a/documentation/kernel-manual/kernel-concepts.xml +++ b/documentation/kernel-manual/kernel-concepts.xml | |||
| @@ -230,9 +230,11 @@ | |||
| 230 | in question. | 230 | in question. |
| 231 | </para> | 231 | </para> |
| 232 | <note><para> | 232 | <note><para> |
| 233 | This practice is not typically encouraged. | 233 | The Yocto Project team strives to place features in the tree such that they can be |
| 234 | However, during development cycles or when large features are merged the practice | 234 | shared by all boards and kernel types where possible. |
| 235 | can't be avoided. | 235 | However, during development cycles or when large features are merged this practice |
| 236 | cannot always be followed. | ||
| 237 | In those cases isolated branches are used for feature merging. | ||
| 236 | </para></note> | 238 | </para></note> |
| 237 | <para> | 239 | <para> |
| 238 | BSP-specific code additions are handled in a similar manner to kernel-specific additions. | 240 | BSP-specific code additions are handled in a similar manner to kernel-specific additions. |