summaryrefslogtreecommitdiffstats
path: root/documentation/kernel-dev/advanced.rst
diff options
context:
space:
mode:
Diffstat (limited to 'documentation/kernel-dev/advanced.rst')
-rw-r--r--documentation/kernel-dev/advanced.rst6
1 files changed, 3 insertions, 3 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
765Many recipes based on the ``linux-yocto-custom.bb`` recipe use Linux 765Many recipes based on the ``linux-yocto-custom.bb`` recipe use Linux
766kernel sources that have only a single branch - "master". This type of 766kernel sources that have only a single branch. This type of
767repository structure is fine for linear development supporting a single 767repository structure is fine for linear development supporting a single
768machine and architecture. However, if you work with multiple boards and 768machine and architecture. However, if you work with multiple boards and
769architectures, a kernel source repository with multiple branches is more 769architectures, a kernel source repository with multiple branches is more
@@ -772,7 +772,7 @@ board to boot. Sometimes, these patches are works-in-progress or
772fundamentally wrong, yet they are still necessary for specific boards. 772fundamentally wrong, yet they are still necessary for specific boards.
773In these situations, you most likely do not want to include these 773In these situations, you most likely do not want to include these
774patches in every kernel you build (i.e. have the patches as part of the 774patches in every kernel you build (i.e. have the patches as part of the
775lone "master" branch). It is situations like these that give rise to 775default branch). It is situations like these that give rise to
776multiple branches used within a Linux kernel sources Git repository. 776multiple branches used within a Linux kernel sources Git repository.
777 777
778Here are repository organization strategies maximizing source reuse, 778Here are repository organization strategies maximizing source reuse,
@@ -812,7 +812,7 @@ Machine Branches
812When you have multiple machines and architectures to support, or you are 812When you have multiple machines and architectures to support, or you are
813actively working on board support, it is more efficient to create 813actively working on board support, it is more efficient to create
814branches in the repository based on individual machines. Having machine 814branches in the repository based on individual machines. Having machine
815branches allows common source to remain in the "master" branch with any 815branches allows common source to remain in the development branch with any
816features specific to a machine stored in the appropriate machine branch. 816features specific to a machine stored in the appropriate machine branch.
817This organization method frees you from continually reintegrating your 817This organization method frees you from continually reintegrating your
818patches into a feature. 818patches into a feature.