From: Carlos Bilbao <carlos.bilbao@amd.com>
To: Jonathan Corbet <corbet@lwn.net>
Cc: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
mauriciofb@gmail.com
Subject: Re: [PATCH] docs/sp_SP: Add translation of process/adding-syscalls
Date: Wed, 3 May 2023 08:15:29 -0500 [thread overview]
Message-ID: <8e1a3ff0-937e-fcd8-bc8c-802fb79c8017@amd.com> (raw)
In-Reply-To: <87ilda7iy0.fsf@meer.lwn.net>
On 5/2/23 12:16, Jonathan Corbet wrote:
> Carlos Bilbao <carlos.bilbao@amd.com> writes:
>
>> Hello Jon,
>>
>> I applied on top of my most recent docs-next version:
>>
>> 0b656310bfc33c5e044df9cf6013df8280ec69cc ("docs/admin-guide/mm/ksm.rst fix
>> intraface -> interface typo")
>>
>> and it worked, and make htmldocs too. Could you please tell me what errors
>> or warnings are you experiencing?
>
> How did you try to apply it? I get the dreaded:
>
> Applying: docs/sp_SP: Add translation of process/adding-syscalls
> error: patch failed: Documentation/translations/sp_SP/process/index.rst:18
> error: Documentation/translations/sp_SP/process/index.rst: patch does not apply
> Patch failed at 0001 docs/sp_SP: Add translation of process/adding-syscalls
>
> The problem was this hunk:
>
> diff --git a/Documentation/translations/sp_SP/process/index.rst
> b/Documentation/translations/sp_SP/process/index.rst
> index 351bcd3921ba..a0ff2e132c54 100644
> --- a/Documentation/translations/sp_SP/process/index.rst
> +++ b/Documentation/translations/sp_SP/process/index.rst
> @@ -18,3 +18,4 @@
> email-clients
> programming-language
> deprecated
> + adding-syscalls
>
> I have your addition of magic-number.rst applied, you seemingly did not
> when the patch was generated.
>
> Figuring these things out takes time. Next time something like this
> happens, can you just regenerate the patch against the current tree and
> resend?
I definitely will, thank you Jon.
>
> Anyway, I've applied it.
>
> Thanks,
>
> jon
Best,
Carlos
prev parent reply other threads:[~2023-05-03 13:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-15 14:35 Carlos Bilbao
2023-03-29 17:15 ` Jonathan Corbet
2023-03-31 14:27 ` Carlos Bilbao
[not found] ` <fc88992d-dfda-0265-5199-d6cae3ba3260@amd.com>
2023-05-02 17:16 ` Jonathan Corbet
2023-05-03 13:15 ` Carlos Bilbao [this message]
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=8e1a3ff0-937e-fcd8-bc8c-802fb79c8017@amd.com \
--to=carlos.bilbao@amd.com \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mauriciofb@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
all inboxes | Powered by JetHome®