Pull Request已成功合入, 合并人@CANN-robot
（感谢 ren-botao 的贡献）
Thanks for your pull-request.
The full list of commands accepted by me can be found at here。
You can get sig-info at here
PR Approval Progress
✅ Congratulations! All modules have met the lgtm and approve requirements.
Module Approval Details
| module | lgtm status | approve status |
|---|---|---|
| repo-cann/ops-math | ✅ 周奇龙, songkai111 (2/2) | ✅ 周奇龙, songkai111 (2/1) |
💡 Tip:
- Committer can comment
/approveor/lgtm- Commenting
/approveimplies both code review (lgtm) and intent to merge (approve)
CLA Signature Pass
ren-botao, thanks for your pull request. All authors of the commits have signed the CLA. 👍
问题/功能描述
本次PR旨在解决ACLNN错误码文档中，因缺少对历史拼写错误码的废弃说明而可能导致用户混淆的问题。具体而言，文档中缺少对旧状态码 ACLNN_ERR_INNER_KEY_CONFILICT 的明确标识和迁移指引，用户可能继续使用该错误的标识符。
修改方案描述
修改方案是在错误码表格中，于正确状态码 ACLNN_ERR_INNER_KEY_CONFLICT 之前，新增一行条目来标记已废弃的拼写错误码 ACLNN_ERR_INNER_KEY_CONFILICT。该条目使用相同的错误码值（561105），并在说明中明确标注“已废弃，请使用最新ACLNN_ERR_INNER_KEY_CONFLICT”，从而清晰地提供了向后兼容性和正确的迁移指引。
流水线任务触发成功
任务链接 [1288fda7a54a4ee7bd2b0fb7deb0bdc3][流水线指导]
| 任务名称 | 状态 | 日志 | 下载链接 |
|---|---|---|---|
| Compile_Ascend_X86 | ✅ SUCCESS | >>>>> | >>>>> |
| Compile_Ascend_X86_mobile_station | ✅ SUCCESS | >>>>> | >>>>> |
| Compile_Ascend_ARM | ✅ SUCCESS | >>>>> | >>>>> |
| Compile_Ascend_X86_experimental | ✅ SUCCESS | >>>>> | >>>>> |
| Compile_Ascend_ARM_experimental | ✅ SUCCESS | >>>>> | >>>>> |
| Compile_Ascend_single | ✅ SUCCESS | >>>>> | >>>>> |
| Compile_Ascend_X86_A5 | ✅ SUCCESS | >>>>> | >>>>> |
| Compile_Ascend_ARM_A5 | ✅ SUCCESS | >>>>> | >>>>> |
| pre_comment | ✅ SUCCESS | >>>>> | |
| Compile_Ascend_X86_ubuntu24 | ✅ SUCCESS | >>>>> | |
| Compile_Ascend_X86_mobile_station_ubuntu24 | ✅ SUCCESS | >>>>> | |
| Compile_Ascend_X86_experimental_ubuntu24 | ✅ SUCCESS | >>>>> | |
| Compile_Ascend_X86_A5_ubuntu24 | ✅ SUCCESS | >>>>> | |
| harmony-infer | ✅ SUCCESS | ||
| Compile_Ascend_ARM_ubuntu24 | ✅ SUCCESS | >>>>> | |
| Compile_Ascend_ARM_experimental_ubuntu24 | ✅ SUCCESS | >>>>> | |
| Compile_Ascend_single_ubuntu24 | ✅ SUCCESS | >>>>> | |
| Compile_Ascend_ARM_A5_ubuntu24 | ✅ SUCCESS | >>>>> | |
| Compile_ARM_monitor | ✅ SUCCESS | >>>>> | >>>>> |
| UT_Test | ✅ SUCCESS | ||
| UT_Test_experimental | ✅ SUCCESS | ||
| UT_Test_kernel | ✅ SUCCESS | ||
| Smoke_A900_npupool | ✅ SUCCESS | >>>>> | |
| API_Check | ✅ SUCCESS | >>>>> | |
| ATK_Test_A2 | ✅ SUCCESS |
[2026-04-08 10:16:43] CI执行结束
流水线任务触发成功
任务链接 [ddcd8a10208145feba052e9dc39811ee][流水线指导]
| 任务名称 | 状态 | 日志 | 下载链接 |
|---|---|---|---|
| codecheck | ✅ SUCCESS | >>>>> | |
| SCA | ✅ SUCCESS | >>>>> | |
| anti_virus | ✅ SUCCESS | >>>>> | |
| Check_Pr | ✅ SUCCESS | >>>>> | |
| StaticCheck_codespell_check | ✅ SUCCESS | ||
| StaticCheck_link_validity_check | ✅ SUCCESS | ||
| StaticCheck_resource_existence_check | ✅ SUCCESS | ||
| StaticCheck_tag_closed_check | ✅ SUCCESS | ||
| StaticCheck_markdownlint | ✅ SUCCESS | ||
| cocheck_codestyle | ✅ SUCCESS |
[2026-04-08 10:10:23] CI执行结束
/lgtm
/approve
Review Guide
This pull-request passes review.
Committers who wrote a comment of /approve are: 周奇龙, songkai111.
Reviewers who wrote a comment of /lgtm are: songkai111, 周奇龙.
描述
返回码宏ACLNN_ERR_INNER_KEY_CONFILICT中单词CONFILICT拼写错误，新增拼写正确的宏ACLNN_ERR_INNER_KEY_CONFLICT，修改为相关资料更新。
关联的Issue
#1189
测试
文档更新
更新了docs/zh/context/aclnn返回码.md
类型标签