forked from radxa/kernel
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ANDROID: README: fix 'cherry picked from' instructions
The instructions in the README should match what `git cherry-pick -x` is producing to get a consistent format that we can later rely on. Fixes: f8978f4 ("ANDROID: add README.md") Change-Id: I7c9f06af65654ae141ef85b52a081641c7320348 Cc: Saravana Kannan <[email protected]> Signed-off-by: Matthias Maennich <[email protected]>
- Loading branch information
Showing
1 changed file
with
4 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,7 +26,7 @@ Additional requirements are listed below based on patch type | |
|
||
- If the patch is a cherry-pick from Linux mainline with no changes at all | ||
- tag the patch subject with `UPSTREAM:`. | ||
- add upstream commit information with a `(cherry-picked from ...)` line | ||
- add upstream commit information with a `(cherry picked from commit ...)` line | ||
- Example: | ||
- if the upstream commit message is | ||
``` | ||
|
@@ -46,14 +46,14 @@ Additional requirements are listed below based on patch type | |
Bug: 135791357 | ||
Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 | ||
(cherry-picked from c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) | ||
(cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) | ||
Signed-off-by: Joe Smith <[email protected]> | ||
``` | ||
|
||
- If the patch requires any changes from the upstream version, tag the patch with `BACKPORT:` | ||
instead of `UPSTREAM:`. | ||
- use the same tags as `UPSTREAM:` | ||
- add comments about the changes under the `(cherry-picked from ...)` line | ||
- add comments about the changes under the `(cherry picked from commit ...)` line | ||
- Example: | ||
``` | ||
BACKPORT: important patch from upstream | ||
|
@@ -64,7 +64,7 @@ instead of `UPSTREAM:`. | |
Bug: 135791357 | ||
Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 | ||
(cherry-picked from c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) | ||
(cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) | ||
[ Resolved minor conflict in drivers/foo/bar.c ] | ||
Signed-off-by: Joe Smith <[email protected]> | ||
``` | ||
|