On Thu, Jul 14, 2022 at 09:05:59PM +0800, Binbin Zhou wrote:
> Hi all:
>
> I have translated all the docs for section "Data structures and low-level utilities"
> of the core-api, and I plan to split them into two patchset submissions.
>
> This patchset contains the following files:
>
> idr.rst
> circular-buffers.rst
> generic-radix-tree.rst
> packing.rst
>
> For more details, please see TODOLIST in core-api/index.rst.
>
> Thanks.
>
> Binbin Zhou (4):
> docs/zh_CN: core-api: Add idr Chinese translation
> docs/zh_CN: core-api: Add circular-buffers Chinese translation
> docs/zh_CN: core-api: Add generic-radix-tree Chinese translation
> docs/zh_CN: core-api: Add packing Chinese translation
$ git am ~/Desktop/20220714_zhoubinbin_docs_zh_cn_core_api_add_some_translations_for_the_data_structures_section_part_1.mbx
应用：docs/zh_CN: core-api: Add idr Chinese translation
应用：docs/zh_CN: core-api: Add circular-buffers Chinese translation
error: 打补丁失败：Documentation/translations/zh_CN/core-api/index.rst:44
error: Documentation/translations/zh_CN/core-api/index.rst：补丁未应用
打补丁失败于 0002 docs/zh_CN: core-api: Add circular-buffers Chinese translation
Since your patches are based on linux-next, 2-4 couldn't be applied to
docs-next now.
commit 4313a24985f00340eeb591fd66aa2b257b9e0a69 from linux-next have changed
core-api/index.rst
diff --git a/Documentation/translations/zh_CN/core-api/index.rst b/Documentation/translations/zh_CN/core-api/index.rst
index 26d9913fc8b60..c52175fc1b610 100644
--- a/Documentation/translations/zh_CN/core-api/index.rst
+++ b/Documentation/translations/zh_CN/core-api/index.rst
@@ -52,7 +52,6 @@ Todolist:
circular-buffers
generic-radix-tree
packing
- bus-virt-phys-mapping
this_cpu_ops
timekeeping
errseq
So please rebase your patch set on jc/docs-next.
Thanks,
Wu
>
> .../zh_CN/core-api/circular-buffers.rst | 205 ++++++++++++++++++
> .../zh_CN/core-api/generic-radix-tree.rst | 23 ++
> .../translations/zh_CN/core-api/idr.rst | 74 +++++++
> .../translations/zh_CN/core-api/index.rst | 8 +-
> .../translations/zh_CN/core-api/packing.rst | 154 +++++++++++++
> 5 files changed, 460 insertions(+), 4 deletions(-)
> create mode 100644 Documentation/translations/zh_CN/core-api/circular-buffers.rst
> create mode 100644 Documentation/translations/zh_CN/core-api/generic-radix-tree.rst
> create mode 100644 Documentation/translations/zh_CN/core-api/idr.rst
> create mode 100644 Documentation/translations/zh_CN/core-api/packing.rst
>
> --
> 2.20.1
Attachment:
signature.asc
Description: PGP signature
