Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix submodules unwanted change due to rebase error #14529

Merged
merged 1 commit into from
Jan 28, 2022

Conversation

jmartinez-silabs
Copy link
Member

@jmartinez-silabs jmartinez-silabs commented Jan 28, 2022

Problem

By mistake #14426 changed/reverted the commit hash used for the efr32_sdk and zap submodules. This was an unwanted action and that change slipped through when I rebased to fixed conflicts

Change overview

Set back the two submodules to the commit set before #14426 was merged

Testing

N/A
Ran the regen, to make sure the zap commit change didn't affect generated files.

@andy31415 andy31415 added the hotfix urgent fix needed, can bypass review label Jan 28, 2022
@andy31415 andy31415 merged commit e2faf8f into project-chip:master Jan 28, 2022
@jmartinez-silabs jmartinez-silabs deleted the submodule_fix branch January 28, 2022 19:37
@github-actions
Copy link

github-actions bot commented Jan 28, 2022

PR #14529: Size comparison from c14afc5 to 2731d2f

Full report (18 builds for cyw30739, efr32, esp32, k32w, linux, p6, qpg, telink)
platform target config section c14afc5 2731d2f change % change
cyw30739 light cyw930739m2evb_01 (read/write) 578114 578114 0 0.0
.app_xip_area 484208 484208 0 0.0
.bss 76652 76652 0 0.0
.data 596 596 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock-app CYW30739 (read/write) 536142 536142 0 0.0
.app_xip_area 443780 443780 0 0.0
.bss 75148 75148 0 0.0
.data 560 560 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
efr32 lighting-app BRD4161A (read only) 842968 842968 0 0.0
(read/write) 126200 126200 0 0.0
.bss 124296 124296 0 0.0
.data 1900 1900 0 0.0
.text 842960 842960 0 0.0
BRD4161A+rpc (read only) 830320 830320 0 0.0
(read/write) 142856 142856 0 0.0
.bss 140856 140856 0 0.0
.data 2000 2000 0 0.0
.text 830312 830312 0 0.0
window-app BRD4161A (read only) 815560 815560 0 0.0
(read/write) 124852 124852 0 0.0
.bss 122996 122996 0 0.0
.data 1856 1856 0 0.0
.text 815552 815552 0 0.0
esp32 all-clusters-app c3devkit (read only) 932920 932920 0 0.0
(read/write) 1397322 1397322 0 0.0
.dram0.bss 69688 69688 0 0.0
.dram0.data 14244 14244 0 0.0
.flash.rodata 194480 194480 0 0.0
.flash.text 932920 932920 0 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 980827 980827 0 0.0
(read/write) 461692 461692 0 0.0
.dram0.bss 74432 74432 0 0.0
.dram0.data 34024 34024 0 0.0
.flash.rodata 221108 221108 0 0.0
.flash.text 975443 975443 0 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 662940 662940 0 0.0
.bss 76428 76428 0 0.0
.data 1868 1868 0 0.0
.text 578844 578844 0 0.0
lock k32w061+release (read/write) 663844 663844 0 0.0
.bss 76692 76692 0 0.0
.data 1892 1892 0 0.0
.text 579460 579460 0 0.0
linux chip-tool-ipv6only arm64 (read only) 6787188 6787188 0 0.0
(read/write) 279985 279985 0 0.0
.bss 55537 55537 0 0.0
.data 1128 1128 0 0.0
.data.rel.ro 176472 176472 0 0.0
.dynamic 560 560 0 0.0
.got 43072 43072 0 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 388348 388348 0 0.0
.text 5824948 5824948 0 0.0
thermostat-no-ble arm64 (read only) 2080748 2080748 0 0.0
(read/write) 149537 149537 0 0.0
.bss 67169 67169 0 0.0
.data 960 960 0 0.0
.data.rel.ro 74288 74288 0 0.0
.dynamic 560 560 0 0.0
.got 4144 4144 0 0.0
.init 24 24 0 0.0
.init_array 336 336 0 0.0
.rodata 129932 129932 0 0.0
.text 1733472 1733472 0 0.0
p6 all-clusters-app default (read/write) 2441720 2441720 0 0.0
.bss 116740 116740 0 0.0
.data 2584 2584 0 0.0
.text 1399984 1399984 0 0.0
light-app default (read/write) 2338536 2338536 0 0.0
.bss 104484 104484 0 0.0
.data 2408 2408 0 0.0
.text 1296800 1296800 0 0.0
lock-app default (read/write) 2304080 2304080 0 0.0
.bss 104228 104228 0 0.0
.data 2360 2360 0 0.0
.text 1262344 1262344 0 0.0
qpg lighting-app qpg6105+debug (read only) 570868 570868 0 0.0
(read/write) 146936 146936 0 0.0
.bss 88640 88640 0 0.0
.data 1060 1060 0 0.0
.text 565548 565548 0 0.0
lock-app qpg6105+debug (read only) 517004 517004 0 0.0
(read/write) 146940 146940 0 0.0
.bss 88112 88112 0 0.0
.data 992 992 0 0.0
.text 511684 511684 0 0.0
persistent-storage-app qpg6105+debug (read only) 107140 107140 0 0.0
(read/write) 146940 146940 0 0.0
.bss 38504 38504 0 0.0
.data 288 288 0 0.0
.text 101820 101820 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 845778 845778 0 0.0
bss 86440 86440 0 0.0
noinit 37160 37160 0 0.0
text 592512 592512 0 0.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotfix urgent fix needed, can bypass review review - pending
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants