tag | 6bf02d6ceb25b3977e9bdeff2f0024b01c6ac08d | |
---|---|---|
tagger | Deyao Ren <deyaoren@google.com> | Tue Feb 13 22:58:11 2024 +0000 |
object | 1eeda34c96838cee19f2f0b6234302c11702904f |
android14-5.15 November 2023 release 11 Artifacts: https://ci.android.com/builds/submitted/11438853/kernel_aarch64/latest
commit | 1eeda34c96838cee19f2f0b6234302c11702904f | [log] [tgz] |
---|---|---|
author | Isaac J. Manjarres <isaacmanjarres@google.com> | Mon Feb 12 06:18:13 2024 -0800 |
committer | Andrew Evans <andrewevans@google.com> | Mon Feb 12 20:51:35 2024 +0000 |
tree | 8ca5b4c2b961d6266d78a9b37d24f580e4764fb6 | |
parent | 1bf56f40e2224aaeed8eb4ed0fb2e878acededba [diff] |
ANDROID: GKI: Preserve CRC value for wireless_send_event() Commit d7c1a9a0ed18 ("wifi: nl80211: validate and configure puncturing bitmap") and commit 9b89495e479c ("wifi: nl80211: Allow authentication frames and set keys on NAN interface") added two entries to the nl80211_ext_feature_index enum, which caused the CRC value for the wireless_send_event() symbol to change. Fix this by hiding the new enum entries during the CRC generation phase. While the values of NUM_NL80211_EXT_FEATURES and MAX_NL80211_EXT_FEATURES have changed, it shouldn't be a problem in this case, since MAX_NL80211_EXT_FEATURES is not used in the kernel source, and the one usage of NUM_NL80211_EXT_FEATURES remains unchanged. Bug: 272227555 Bug: 324871355 Bug: 324905919 Change-Id: I8b5be4c39b1ab72f0f2b3c9ff10f15a981a431db Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
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)