Lines Matching +full:master +full:- +full:side
1 .. SPDX-License-Identifier: GPL-2.0
5 Linuxized ACPICA - Introduction to ACPICA Release Automation
8 :Copyright: |copy| 2013-2016, Intel Corporation
24 system (OS)-independent reference implementation of the Advanced
36 +---------------------------------------------------------+
38 | +---------------------------------------------------+ |
39 | | +------------------+ | |
41 | | +------------------+ | |
42 | | +----------------------+ | |
44 | | +----------------------+ | |
45 | | +------------------+ ACPICA Components | |
47 | | +------------------+ | |
48 | | +---------------------+ | |
50 | | +---------------------+ | |
51 | | +---------------------+ | |
53 | | +---------------------+ | |
54 | +---------------------------------------------------+ | |
55 | | | +------------------+ | | |
57 | | | +------------------+ | | |
58 | | +-------------------------------------------------|-+ |
59 | | +--------------------+ | |
61 | | +--------------------+ | |
62 | | +------------------+ | |
64 | | +------------------+ Linux/ACPI Components | |
65 | | +--------------------+ | |
67 | | +--------------------+ | |
68 | | +--------------------------+ | |
70 | | +--------------------------+ | |
71 | | +--------+ | |
73 | | +--------+ | |
74 | +---------------------------------------------------+ |
76 +---------------------------------------------------------+
81 A. OS Service Layer - Provided by Linux to offer OS dependent
89 B. ACPICA Functionality - Released from ACPICA code base to offer
96 C. Linux/ACPI Functionality - Providing Linux specific ACPI
106 D. Architecture Specific ACPICA/ACPI Functionalities - Provided by the
132 +-----------------------------+
133 | acpica / master (-) commits |
134 +-----------------------------+
137 | /---------------------\ +----------------------+
138 | < Linuxize repo Utility >-->| old linuxized acpica |--+
139 | \---------------------/ +----------------------+ |
141 /---------\ |
143 \---------/ \
144 /|\ /+-+
146 +-----------------------------+ | |
147 | acpica / master (+) commits | | |
148 +-----------------------------+ | |
151 /-----------------------\ +----------------------+ | |
152 < Linuxize repo Utilities >-->| new linuxized acpica |--+ |
153 \-----------------------/ +----------------------+ |
155 +--------------------------+ /----------------------\
156 | Linuxized ACPICA Patches |<----------------< Linuxize patch Utility >
157 +--------------------------+ \----------------------/
160 /---------------------------\
162 \---------------------------/
165 +-----------------------+ /------------------\ +----------------+
166 | linux-pm / linux-next |-->< Linux Merge Window >-->| linux / master |
167 +-----------------------+ \------------------/ +----------------+
169 Figure 2. ACPICA -> Linux Upstream Process
172 A. Linuxize Utilities - Provided by the ACPICA repository, including a
175 B. acpica / master - "master" branch of the git repository at
177 C. linux-pm / linux-next - "linux-next" branch of the git repository at
178 <https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git>.
179 D. linux / master - "master" branch of the git repository at
192 automatically without manual modifications, the "linux / master" tree should
202 1. Legacy divergences - Before the current ACPICA release process was
207 2. Manual modifications - Any manual modification (eg. coding style fixes)
212 3. Linux specific features - Sometimes it's impossible to use the
216 they are left as committed ACPICA divergences unless the ACPICA side can
218 4. ACPICA release fixups - ACPICA only tests commits using a set of the
226 5. Fast tracking of ACPICA commits - Some ACPICA commits are regression
227 fixes or stable-candidate material, so they are applied in advance with
229 rebased on the ACPICA side in order to offer better solutions, new ACPICA
239 1. Cherry-pick an ACPICA commit
244 Then the gen-patch.sh command can help to cherry-pick an ACPICA commit
249 $ generate/linux/gen-patch.sh -u [commit ID]
254 2. Cherry-pick recent ACPICA commits
264 $ generate/linux/make-patches.sh -u [commit ID]
279 # generate/linux/divergence.sh -s ../linux