lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <87ilda7iy0.fsf@meer.lwn.net>
Date:   Tue, 02 May 2023 11:16:07 -0600
From:   Jonathan Corbet <corbet@....net>
To:     Carlos Bilbao <carlos.bilbao@....com>
Cc:     linux-kernel@...r.kernel.org, linux-doc@...r.kernel.org,
        mauriciofb@...il.com, Carlos Bilbao <carlos.bilbao@....com>
Subject: Re: [PATCH] docs/sp_SP: Add translation of process/adding-syscalls

Carlos Bilbao <carlos.bilbao@....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?

Anyway, I've applied it.

Thanks,

jon

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ