diff options
Diffstat (limited to 'documentation/kernel-dev')
-rw-r--r-- | documentation/kernel-dev/advanced.rst | 6 | ||||
-rw-r--r-- | documentation/kernel-dev/concepts-appx.rst | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/documentation/kernel-dev/advanced.rst b/documentation/kernel-dev/advanced.rst index 5a6b466ffb..b5290b61b3 100644 --- a/documentation/kernel-dev/advanced.rst +++ b/documentation/kernel-dev/advanced.rst | |||
@@ -763,7 +763,7 @@ Organizing Your Source | |||
763 | ====================== | 763 | ====================== |
764 | 764 | ||
765 | Many recipes based on the ``linux-yocto-custom.bb`` recipe use Linux | 765 | Many recipes based on the ``linux-yocto-custom.bb`` recipe use Linux |
766 | kernel sources that have only a single branch - "master". This type of | 766 | kernel sources that have only a single branch. This type of |
767 | repository structure is fine for linear development supporting a single | 767 | repository structure is fine for linear development supporting a single |
768 | machine and architecture. However, if you work with multiple boards and | 768 | machine and architecture. However, if you work with multiple boards and |
769 | architectures, a kernel source repository with multiple branches is more | 769 | architectures, a kernel source repository with multiple branches is more |
@@ -772,7 +772,7 @@ board to boot. Sometimes, these patches are works-in-progress or | |||
772 | fundamentally wrong, yet they are still necessary for specific boards. | 772 | fundamentally wrong, yet they are still necessary for specific boards. |
773 | In these situations, you most likely do not want to include these | 773 | In these situations, you most likely do not want to include these |
774 | patches in every kernel you build (i.e. have the patches as part of the | 774 | patches in every kernel you build (i.e. have the patches as part of the |
775 | lone "master" branch). It is situations like these that give rise to | 775 | default branch). It is situations like these that give rise to |
776 | multiple branches used within a Linux kernel sources Git repository. | 776 | multiple branches used within a Linux kernel sources Git repository. |
777 | 777 | ||
778 | Here are repository organization strategies maximizing source reuse, | 778 | Here are repository organization strategies maximizing source reuse, |
@@ -812,7 +812,7 @@ Machine Branches | |||
812 | When you have multiple machines and architectures to support, or you are | 812 | When you have multiple machines and architectures to support, or you are |
813 | actively working on board support, it is more efficient to create | 813 | actively working on board support, it is more efficient to create |
814 | branches in the repository based on individual machines. Having machine | 814 | branches in the repository based on individual machines. Having machine |
815 | branches allows common source to remain in the "master" branch with any | 815 | branches allows common source to remain in the development branch with any |
816 | features specific to a machine stored in the appropriate machine branch. | 816 | features specific to a machine stored in the appropriate machine branch. |
817 | This organization method frees you from continually reintegrating your | 817 | This organization method frees you from continually reintegrating your |
818 | patches into a feature. | 818 | patches into a feature. |
diff --git a/documentation/kernel-dev/concepts-appx.rst b/documentation/kernel-dev/concepts-appx.rst index cf2e75d853..910318e0f9 100644 --- a/documentation/kernel-dev/concepts-appx.rst +++ b/documentation/kernel-dev/concepts-appx.rst | |||
@@ -211,8 +211,8 @@ view, there is a linear path that travels from the baseline | |||
211 | ``kernel.org``, through a select group of features and ends with their | 211 | ``kernel.org``, through a select group of features and ends with their |
212 | BSP-specific commits. In other words, the divisions of the kernel are | 212 | BSP-specific commits. In other words, the divisions of the kernel are |
213 | transparent and are not relevant to the developer on a day-to-day basis. | 213 | transparent and are not relevant to the developer on a day-to-day basis. |
214 | From the developer's perspective, this path is the "master" branch in | 214 | From the developer's perspective, this path is the development branch. |
215 | Git terms. The developer does not need to be aware of the existence of | 215 | The developer does not need to be aware of the existence of |
216 | any other branches at all. Of course, it can make sense to have these | 216 | any other branches at all. Of course, it can make sense to have these |
217 | branches in the tree, should a person decide to explore them. For | 217 | branches in the tree, should a person decide to explore them. For |
218 | example, a comparison between two BSPs at either the commit level or at | 218 | example, a comparison between two BSPs at either the commit level or at |