tag | 6a927b9edac08baabe91caaf464d57c3ae2d4d42 | |
---|---|---|
tagger | Howard Chen <howardsoc@google.com> | Wed Aug 30 11:14:12 2023 +0800 |
object | a78ea39db117e81440676fcca8ca8ffb064369de |
android13-5.15 August 2023 release 1 Artifacts: https://ci.android.com/builds/submitted/10710420/kernel_aarch64/latest
commit | a78ea39db117e81440676fcca8ca8ffb064369de | [log] [tgz] |
---|---|---|
author | Matthias Maennich <maennich@google.com> | Wed Aug 23 22:04:54 2023 +0000 |
committer | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Aug 24 15:38:36 2023 +0000 |
tree | a3c68d499fdfd873b3fcc7fe81f620135fadc912 | |
parent | e5901571209c5c65033ff9b3cedaeec3debd048a [diff] |
ANDROID: Revert ABI breakage due to accidental CRC value changes Commit 01e61d38593c ("ANDROID: vendor_hooks: Add hooks for lookaround") subtly changed the CRC values computed for 5 symbols: buffer_migrate_page migrate_page_copy migrate_page_move_mapping migrate_page_states migrate_pages This was caused by an include in mm/migrate.c that exposed additional type information relevant for the modversions CRC computation. Commit 930cf7174fe2 ("ANDROID: oplus: Update the ABI xml and symbol list") updated the ABI representation and that breaking change was unnoticed. Fix that by guarding the include and reverting the ABI definition. Effective ABI change: function symbol 'int buffer_migrate_page(struct address_space *, struct page *, struct page *, enum migrate_mode)' changed CRC changed from 0x7951f1db to 0xcdeca50f function symbol 'void migrate_page_copy(struct page *, struct page *)' changed CRC changed from 0xb3b9058d to 0xe97d88f0 function symbol 'int migrate_page_move_mapping(struct address_space *, struct page *, struct page *, int)' changed CRC changed from 0x74bd3238 to 0xb7809eee function symbol 'void migrate_page_states(struct page *, struct page *)' changed CRC changed from 0x32ac080e to 0x8caf3272 function symbol 'int migrate_pages(struct list_head *, new_page_t *, free_page_t *, unsigned long int, enum migrate_mode, int, unsigned int *)' changed CRC changed from 0xe0b25d16 to 0x90f84eaa Bug: 296960489 Fixes: 01e61d38593c ("ANDROID: vendor_hooks: Add hooks for lookaround") Signed-off-by: Matthias Maennich <maennich@google.com> (cherry picked from https://android-review.googlesource.com/q/commit:4f49704212e04e8fec00989f31fc8141f5dfa358) Merged-In: I62421984a3e0306490db8e62e86562a95ea06ef4 Change-Id: I62421984a3e0306490db8e62e86562a95ea06ef4
BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.
EXPORT_SYMBOL_GPL()
require an in-tree modular driver that uses the symbol -- so include the new driver or changes to an existing driver in the same patchset as the export.LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.
scripts/checkpatch.pl
UPSTREAM:
, BACKPORT:
, FROMGIT:
, FROMLIST:
, or ANDROID:
.Change-Id:
tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)Bug:
tag.Signed-off-by:
tag by the author and the submitterAdditional requirements are listed below based on patch type
UPSTREAM:
, BACKPORT:
UPSTREAM:
.(cherry picked from commit ...)
lineimportant patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org>
- then Joe Smith would upload the patch for the common kernel as
UPSTREAM: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) Signed-off-by: Joe Smith <joe.smith@foo.org>
BACKPORT:
instead of UPSTREAM:
.UPSTREAM:
(cherry picked from commit ...)
lineBACKPORT: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) [joe: Resolved minor conflict in drivers/foo/bar.c ] Signed-off-by: Joe Smith <joe.smith@foo.org>
FROMGIT:
, FROMLIST:
,FROMGIT:
(cherry picked from commit <sha1> <repo> <branch>)
. This must be a stable maintainer branch (not rebased, so don't use linux-next
for example).BACKPORT: FROMGIT:
important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org>
- then Joe Smith would upload the patch for the common kernel as
FROMGIT: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 (cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch) Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
FROMLIST:
Link:
tag with a link to the submittal on lore.kernel.orgBug:
tag with the Android bug (required for patches not accepted into a maintainer tree)BACKPORT: FROMLIST:
FROMLIST: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/ Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
ANDROID:
ANDROID:
Fixes:
tag that cites the patch with the bugANDROID: fix android-specific bug in foobar.c This is the detailed description of the important fix Fixes: 1234abcd2468 ("foobar: add cool feature") Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
ANDROID:
Bug:
tag with the Android bug (required for android-specific features)