commit | a2bf50800d51263181a65cdc8918ce9bfe23c8dc | [log] [tgz] |
---|---|---|
author | Yongqin Liu <yongqin.liu@linaro.org> | Thu Aug 20 00:27:35 2020 +0800 |
committer | YongQin Liu <yongqin.liu@linaro.org> | Wed Aug 19 16:33:38 2020 +0000 |
tree | 5f36ae18af3f468dd0009419a9d659d6179934f1 | |
parent | 1d079bc4f1e10a3cc3b248068a1fc32bba60b111 [diff] |
ANDROID: update abi for ieee80211_get_channel_khz and ieee80211_channel_to_freq_khz which is needed by ath10k_core.ko, otherwise will get the following ismod error: [ 3.101175] init: Loading module /lib/modules/ath10k_core.ko with args '' [ 3.119678] ath10k_core: Unknown symbol ieee80211_channel_to_freq_khz (err -2) [ 3.159716] init: Failed to insmod '/lib/modules/ath10k_core.ko' with args '': No such file or directory [ 3.169337] init: LoadWithAliases was unable to load ath10k_core [ 3.175760] init: Failed to load kernel modules [ 3.180872] init: InitFatalReboot: signal 6 Updated via: $ ./build/abi/bootstrap $ <export PATH and LD_LIBRARY_PATH> $ BUILD_CONFIG=common/build.config.db845c build/build_abi.sh --update Not sure why they were not added by the following commit for db845c: 61837660f5751 ("ANDROID: ABI: update ABI after 6GHz bad support") Test: boot tested with db845c build Fixes: 61837660f5751 ("ANDROID: ABI: update ABI after 6GHz bad support") Fixes: c594051168e9c ("BACKPORT: cfg80211: express channels with a KHz component") Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: Id868dc501744052de9aaa7c450cb7a667cc2f87e
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.
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.
script/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 ...)
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 c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) Signed-off-by: Joe Smith <joe.smith@foo.org>
BACKPORT:
instead of UPSTREAM:
.UPSTREAM:
(cherry-picked from ...)
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 c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) [ 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.orgBACKPORT: 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)