[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20250826173327601oSOj6wF-lo1Ne_UTeIKau@zte.com.cn>
Date: Tue, 26 Aug 2025 17:33:27 +0800 (CST)
From: <shao.mingyin@....com.cn>
To: <dzm91@...t.edu.cn>
Cc: <alexs@...nel.org>, <si.yanteng@...ux.dev>, <corbet@....net>,
<linux-doc@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<yang.yang29@....com.cn>, <xu.xin16@....com.cn>,
<yang.tao172@....com.cn>
Subject: Re: [PATCH v3 0/7] Docs/zh_CN: Translate filesystems docs to Simplified Chinese
>> From: Shao Mingyin<shao.mingyin@....com.cn>
>>
>> translate the filesystems docs into Simplified Chinese.
>> v2->v3
>> add two patches to the patch set.
>>
>> Shao Mingyin (5):
>> Docs/zh_CN: Translate ubifs.rst to Simplified Chinese
>> Docs/zh_CN: Translate ubifs-authentication.rst to Simplified Chinese
>> Docs/zh_CN: Translate gfs2.rst to Simplified Chinese
>> Docs/zh_CN: Translate gfs2-uevents.rst to Simplified Chinese
>> Docs/zh_CN: Translate gfs2-glocks.rst to Simplified Chinese
>>
>> Wang Longjie (2):
>> Docs/zh_CN: Translate dnotify.rst to Simplified Chinese
>> Docs/zh_CN: Translate inotify.rst to Simplified Chinese
>
>
>$ b4 am 20250822171232584GYKo3tPbZNfE3VsK7dvM0@....com.cn
>Grabbing thread from
>lore.kernel.org/all/20250822171232584GYKo3tPbZNfE3VsK7dvM0@....com.cn/t.mbox.gz
>Analyzing 8 messages in the thread
>Looking for additional code-review trailers on lore.kernel.org
>Checking attestation on all messages, may take a moment...
>---
> [PATCH v3 1/7] Docs/zh_CN: Translate ubifs.rst to Simplified Chinese
> [PATCH v3 2/7] Docs/zh_CN: Translate ubifs-authentication.rst to
>Simplified Chinese
> [PATCH v3 3/7] Docs/zh_CN: Translate gfs2.rst to Simplified Chinese
> [PATCH v3 4/7] Docs/zh_CN: Translate gfs2-uevents.rst to Simplified
>Chinese
> [PATCH v3 5/7] Docs/zh_CN: Translate gfs2-glocks.rst to Simplified
>Chinese
> [PATCH v3 6/7] Docs/zh_CN: Translate dnotify.rst to Simplified Chinese
> [PATCH v3 7/7] Docs/zh_CN: Translate inotify.rst to Simplified Chinese
>---
>Total patches: 7
>---
>Cover:
>../v3_20250822_shao_mingyin_docs_zh_cn_translate_filesystems_docs_to_simplified_chinese.cover
> Link:
>https://lore.kernel.org/r/20250822171232584GYKo3tPbZNfE3VsK7dvM0@zte.com.cn
> Base: applies clean to current tree
> git checkout -b v3_20250822_shao_mingyin_zte_com_cn HEAD
> git am
>../v3_20250822_shao_mingyin_docs_zh_cn_translate_filesystems_docs_to_simplified_chinese.mbx
>
>$ git checkout -b v3_20250822_shao_mingyin_zte_com_cn HEAD
>Switched to a new branch 'v3_20250822_shao_mingyin_zte_com_cn'
>
>$ git am
>../v3_20250822_shao_mingyin_docs_zh_cn_translate_filesystems_docs_to_simplified_chinese.mbx
>Applying: Docs/zh_CN: Translate ubifs.rst to Simplified Chinese
>Applying: Docs/zh_CN: Translate ubifs-authentication.rst to Simplified
>Chinese
>Applying: Docs/zh_CN: Translate gfs2.rst to Simplified Chinese
>error: corrupt patch at line 80
>Patch failed at 0003 Docs/zh_CN: Translate gfs2.rst to Simplified Chinese
>
>Hi Mingyin,
>
>I cannot apply this patchset to the docs-next branch of lwn or alex
>kernel tree. Please double check your patchset.
>
>Dongliang Mu
>
Hi Dongliang,
The second fragment of 'PATCH v3 3/7' had a blank line at the end,
which disappeared from the patch obtained through the 'b4' command,
causing 'git am' to detect patch damage. This blank line exists in the
source file as part of the original text in the patch fragment.
This looks like a bug in some process because the patch in the email
I sent had this blank line.
I will send v4 version to avoid this issue
=========patch fragment===========
diff --git a/Documentation/translations/zh_CN/filesystems/index.rst b/Documentation/translations/zh_CN/filesystems/index.rst
index 3c25b39739db..37968fb91f1a 100644
--- a/Documentation/translations/zh_CN/filesystems/index.rst
+++ b/Documentation/translations/zh_CN/filesystems/index.rst
@@ -28,4 +28,5 @@ Linux Kernel中的文件系统
tmpfs
ubifs
ubifs-authentication
+ gfs2
--
=========patch fragment===========
Shao Mingyin
>> .../zh_CN/filesystems/dnotify.rst | 67 ++++
>> .../zh_CN/filesystems/gfs2-glocks.rst | 199 ++++++++++
>> .../zh_CN/filesystems/gfs2-uevents.rst | 97 +++++
>> .../translations/zh_CN/filesystems/gfs2.rst | 57 +++
>> .../translations/zh_CN/filesystems/index.rst | 16 +
>> .../zh_CN/filesystems/inotify.rst | 81 ++++
>> .../filesystems/ubifs-authentication.rst | 354 ++++++++++++++++++
>> .../translations/zh_CN/filesystems/ubifs.rst | 114 ++++++
>> 8 files changed, 985 insertions(+)
>> create mode 100644 Documentation/translations/zh_CN/filesystems/dnotify.rst
>> create mode 100644 Documentation/translations/zh_CN/filesystems/gfs2-glocks.rst
>> create mode 100644 Documentation/translations/zh_CN/filesystems/gfs2-uevents.rst
>> create mode 100644 Documentation/translations/zh_CN/filesystems/gfs2.rst
>> create mode 100644 Documentation/translations/zh_CN/filesystems/inotify.rst
>> create mode 100644 Documentation/translations/zh_CN/filesystems/ubifs-authentication.rst
>> create mode 100644 Documentation/translations/zh_CN/filesystems/ubifs..rst
Powered by blists - more mailing lists