From: baihaowen <baihaowen@meizu.com>
To: yanteng si <siyanteng01@gmail.com>
Cc: Alex Shi <seakeel@gmail.com>, Alex Shi <alexs@kernel.org>,
Jonathan Corbet <corbet@lwn.net>,
Linux Doc Mailing List <linux-doc@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Yanteng Si <siyanteng@loongson.cn>
Subject: Re: [PATCH 1/2] docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
Date: Mon, 25 Apr 2022 16:18:39 +0800 [thread overview]
Message-ID: <53ac1850-0286-0dc7-4a76-8a0ddee696c0@meizu.com> (raw)
In-Reply-To: <CAEensMzgJ6LmGiJajqwgE3cQCR-pcgr1o35Qf=n1K215BwHLhA@mail.gmail.com>
在 4/25/22 11:19 AM, yanteng si 写道:
> baihaowen <baihaowen@meizu.com> 于2022年4月25日周一 09:17写道:
>> 在 4/24/22 11:16 AM, Alex Shi 写道:
>>> On 4/24/22 10:56, baihaowen wrote:
>>>>>> + ====== ========== ==================
>>>> hi, Alex
>>>> I can apply local.
>>>> ➜ linux-next git:(heads/next-20220421) ✗ git am doc_pageonwer_patches/0001-docs-zh_CN-sync-with-original-text-Documentation-vm-.patch
>>>> 应用:docs/zh_CN: sync with original text Documentation/vm/page_owner.rst
>>>> ➜ linux-next git:(heads/next-20220421) ✗ git am doc_pageonwer_patches/0002-doc-vm-page_owner.rst-Fix-table-display-confusion.patch
>>>> 应用:doc/vm/page_owner.rst: Fix table display confusion
>>>>
>>>> I think git send-email will change format by my select. I'll try to resend.
>>> Send to yourself only then get it from your email client and try applying.
>>>
>>> Thanks
>>> Alex
>> Hi Alex
>>
>> Could you tell me how do you do when you get a patch from email ?
> $: git clone git://git.kernel.org/pub/scm/utils/b4/b4.git
> $: b4/b4.sh am <message-id>
> ###在你的邮箱里查看原始有邮件,然后找到message-id,贴过来就行,前提是你的补丁系列在lore里是按照前几天我说的那么弄。
> $: vim xxxx.mbx ### [modify your patch]
> $: git am xxxx.mbx
>
>
> Thanks,
> Yanteng
>
>> I get my patch from email and then copy-patse to a new file, then git am xx.patch.
>> It will notice 补丁格式检测失败。
>>
>> --
>> Haowen Bai
>>
hi, Yanteng
No matter I select y or N, I could not git am the Chinese translation patch.
doc_pageonwer_patches/0001-docs-zh_CN-sync-with-original-text-Documentation-vm-.patch
Which 8bit encoding should I declare [UTF-8]? y
Are you sure you want to use <y> [y/N]? y
doc_pageonwer_patches/0001-docs-zh_CN-sync-with-original-text-Documentation-vm-.patch
Which 8bit encoding should I declare [UTF-8]? N
Are you sure you want to use <N> [y/N]? y
$git am xxx.patch
error: cannot convert from y to UTF-8
fatal: could not parse patch
or
$git am xxx.patch
error: cannot convert from N to UTF-8
fatal: could not parse patch
so, the problem is happening when I did git send-email, and the original zh_CN patch is successful for git am.
Have you ever meet this problem ?
--
Haowen Bai
next prev parent reply other threads:[~2022-04-25 8:18 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-15 1:30 [PATCH V3] " 司延腾
2022-04-15 2:09 ` yanteng si
2022-04-18 1:58 ` yanteng si
2022-04-18 9:28 ` [PATCH V4] " Haowen Bai
2022-04-18 12:41 ` Alex Shi
2022-04-19 1:23 ` Haowen Bai
2022-04-19 1:46 ` yanteng si
2022-04-19 2:07 ` [PATCH V5] " Haowen Bai
2022-04-19 2:33 ` yanteng si
2022-04-19 3:24 ` baihaowen
2022-04-19 3:34 ` [PATCH V6] " Haowen Bai
2022-04-19 4:27 ` [PATCH V5] " Alex Shi
2022-04-19 5:49 ` [PATCH V7] " Haowen Bai
2022-04-19 7:34 ` [PATCH V8] " Haowen Bai
2022-04-19 14:42 ` yanteng si
2022-04-20 3:06 ` [PATCH 0/2] " Haowen Bai
2022-04-20 3:06 ` [PATCH 1/2] docs/zh_CN: " Haowen Bai
2022-04-23 10:27 ` Alex Shi
2022-04-24 2:56 ` baihaowen
2022-04-24 3:16 ` Alex Shi
2022-04-25 1:17 ` baihaowen
2022-04-25 3:19 ` yanteng si
2022-04-25 8:18 ` baihaowen [this message]
2022-04-26 6:57 ` yanteng si
2022-04-26 8:20 ` Alex Shi
2022-04-26 8:23 ` baihaowen
[not found] ` <3f93bb0d-5658-f269-f8cc-d0a964ffb68b@gmail.com>
2022-04-26 8:30 ` baihaowen
2022-04-20 3:06 ` [PATCH 2/2] doc/vm/page_owner.rst: Fix table display confusion Haowen Bai
2022-04-20 12:31 ` Bagas Sanjaya
2022-04-20 12:46 ` Jonathan Corbet
2022-04-24 3:38 ` Akira Yokosawa
2022-04-24 5:24 ` Jonathan Corbet
2022-04-26 8:39 ` Alex Shi
2022-04-21 12:26 ` [PATCH 0/2] sync with original text Documentation/vm/page_owner.rst yanteng si
2022-04-22 1:40 ` baihaowen
2022-04-22 2:35 ` Akira Yokosawa
2022-04-19 1:24 ` [PATCH V4] docs/zh_CN: " baihaowen
2022-04-18 9:29 ` [PATCH V3] " baihaowen
2022-04-25 7:32 [PATCH 0/2] " Haowen Bai
2022-04-25 7:32 ` [PATCH 1/2] docs/zh_CN: " Haowen Bai
2022-04-25 16:57 ` Jonathan Neuschäfer
[not found] <1650956694-30699-1-git-send-email-baihaowen@meizu.com>
2022-04-26 7:04 ` Haowen Bai
2022-04-26 7:07 [PATCH 0/2] " Haowen Bai
2022-04-26 7:07 ` [PATCH 1/2] docs/zh_CN: " Haowen Bai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53ac1850-0286-0dc7-4a76-8a0ddee696c0@meizu.com \
--to=baihaowen@meizu.com \
--cc=alexs@kernel.org \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=seakeel@gmail.com \
--cc=siyanteng01@gmail.com \
--cc=siyanteng@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®