在 2025/2/5 0:56, Jonathan Corbet 写道:
zhangwei <zhangwei@xxxxxxxxxxxxxxxxx> writes:
在 2025/1/21 13:12, zhangwei 写道:
Translate .../security/self-protection.rst into Chinese.
Update the translation through commit b080e52110ea
("docs: update self-protection __ro_after_init status")
Signed-off-by: zhangwei <zhangwei@xxxxxxxxxxxxxxxxx>
---
Hi, jon
Please apply Zhao Shuo's patchset first, and then apply mine.
https://lore.kernel.org/linux-doc/cover.1737603330.git.zhaoshuo@xxxxxxxxxxxxxxxxx/
<https://lore.kernel.org/linux-doc/cover.1737603330.git.zhaoshuo@xxxxxxxxxxxxxxxxx/>
I did that, but yours still fails to apply. Can you send me a respin
against docs-next, please?
Thanks,
jon
[root@fedora lwn]# git branch
* docs-next
master
[root@fedora lwn]# git pull
Already up to date.
[root@fedora lwn]# b4 am 20250121051234.79066-1-zhangwei@xxxxxxxxxxxxxxxxx
Grabbing thread from
lore.kernel.org/all/20250121051234.79066-1-zhangwei@xxxxxxxxxxxxxxxxx/t.mbox.gz
Analyzing 5 messages in the thread
Looking for additional code-review trailers on lore.kernel.org
Analyzing 0 code-review messages
Checking attestation on all messages, may take a moment...
---
✓ [PATCH v2] docs/zh_CN: Add self-protection index Chinese translation
+ Reviewed-by: Yanteng Si <si.yanteng@xxxxxxxxx> (✓ DKIM/linux.dev)
+ Reviewed-by: Yuxian Mao <maoyuxian@xxxxxxxxxxxxxxxxx> (✓
DKIM/cqsoftware.com.cn)
---
✓ Signed: DKIM/cqsoftware.com.cn
---
Total patches: 1
---
Link:
https://lore.kernel.org/r/20250121051234.79066-1-zhangwei@xxxxxxxxxxxxxxxxx
Base: applies clean to current tree
git checkout -b v2_20250121_zhangwei_cqsoftware_com_cn HEAD
git am
./v2_20250121_zhangwei_docs_zh_cn_add_self_protection_index_chinese_translation.mbx
[root@fedora lwn]# git am
./v2_20250121_zhangwei_docs_zh_cn_add_self_protection_index_chinese_translation.mbx
Applying: docs/zh_CN: Add self-protection index Chinese translation
[root@fedora lwn]#
I re-pushed it and it was possible to punch in the patch.
How do I modify it
Thanks,
zhangwei