Re: [PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4

From: Yanteng Si <siyanteng@loongson.cn>
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>,
	Jonathan Corbet <corbet@lwn.net>
Cc: ojeda@kernel.org, alex.gaynor@gmail.com, wedsonaf@gmail.com,
	boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com,
	benno.lossin@proton.me, a.hindborg@samsung.com,
	aliceryhl@google.com, nathan@kernel.org, ndesaulniers@google.com,
	morbo@google.com, justinstitt@google.com, alexs@kernel.org,
	dzm91@hust.edu.cn, linux-doc@vger.kernel.org,
	rust-for-linux@vger.kernel.org, llvm@lists.linux.dev
Subject: Re: [PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4
Date: Sat, 27 Apr 2024 12:38:20 +0800	[thread overview]
Message-ID: <f49129dd-ed6f-4940-b851-0282fc320234@loongson.cn> (raw)
In-Reply-To: <CANiq72mHoh=qgOGPj29hpS7EhVcXi5Q_7GYsycKhYwj3QbsTag@mail.gmail.com>

在 2024/4/27 00:47, Miguel Ojeda 写道:
> On Fri, Apr 26, 2024 at 3:42 PM Jonathan Corbet <corbet@lwn.net> wrote:
>> I guess I don't see any reason why the translation couldn't go through
>> docs-next as usual?  It will all even out during the merge window,
>> right?  Or am I missing something?
> Yeah, that is what I am thinking as well, although Yanteng is
> mentioning conflicts somewhere, so I may be missing something too.
>
Sorry, I may have made a mistake, there are no conflicts in this patch set.

What I mean is that if I translate these two patches as two separate 
patches,

merge them into the rust tree, and then merge the rest of the patch set into

the doc tree, it might cause a conflict in the linux-next tree, because 
in order

of order, the two patches have to be applied after this patch set. I'm 
not sure

I've understood the whole process correctly.

Now that the two patches have become part of the patch set, there will be no

conflict no matter which tree is eventually merged into.

Thanks,

Yanteng