public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Corbet <corbet@lwn.net>
To: Hu Haowen <src.res.211@gmail.com>,
	siyanteng@loongson.cn, bobwxc@email.cn, alexs@kernel.org,
	gregkh@linuxfoundation.org, nabijaczleweli@nabijaczleweli.xyz,
	carlos.bilbao@amd.com, me@lirui.org
Cc: Hu Haowen <src.res.211@gmail.com>,
	linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] docs/zh_TW: rewrite index.rst
Date: Fri, 14 Jul 2023 13:07:43 -0600	[thread overview]
Message-ID: <87351q1fcw.fsf@meer.lwn.net> (raw)
In-Reply-To: <20230708054052.45967-1-src.res.211@gmail.com>

Hu Haowen <src.res.211@gmail.com> writes:

> Update zh_TW's index.rst to the version of commit 0c7b4366f1ab ("docs:
> Rewrite the front page") with some reference from commit f4bf1cd4ac9c
> ("docs: move asm-annotations.rst into core-api") and commit eef24f7054a6
> ("docs/zh_CN: Rewrite the Chinese translation front page").
>
> Signed-off-by: Hu Haowen <src.res.211@gmail.com>
> ---
>  Documentation/translations/zh_TW/index.rst | 156 ++++++++-------------
>  1 file changed, 56 insertions(+), 100 deletions(-)

So your two patches conflict with each other.  I've sorted it out and
applied this, but it would be nicer if I didn't have to do that...

Thanks,

jon

  reply	other threads:[~2023-07-14 19:07 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-08  5:40 [PATCH] docs/zh_TW: rewrite index.rst Hu Haowen
2023-07-14 19:07 ` Jonathan Corbet [this message]
     [not found]   ` <d2da2720-ebcb-ee77-f732-a23184c560a6@gmail.com>
2023-07-15  7:52     ` Fwd: " src res

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=87351q1fcw.fsf@meer.lwn.net \
    --to=corbet@lwn.net \
    --cc=alexs@kernel.org \
    --cc=bobwxc@email.cn \
    --cc=carlos.bilbao@amd.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=me@lirui.org \
    --cc=nabijaczleweli@nabijaczleweli.xyz \
    --cc=siyanteng@loongson.cn \
    --cc=src.res.211@gmail.com \
    /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