| 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
| ||
|
Date: Wed, 29 May 2024 12:29:57 +0200 From: Thorsten Blum <thorsten.blum@...lux.com> To: Krzysztof Kozlowski <krzk@...nel.org> Cc: linux-kernel@...r.kernel.org Subject: Re: [RESEND PATCH] w1: Add missing newline and fix typos in w1_bus_master comment On 27. May 2024, at 13:49, Krzysztof Kozlowski <krzk@...nel.org> wrote: > On 27/05/2024 11:27, Thorsten Blum wrote: >> - Add missing newline before @return >> - s/bytes/byte/ >> - s/handles/handle/ >> >> Signed-off-by: Thorsten Blum <thorsten.blum@...lux.com> > > Do not attach (thread) your patchsets to some other threads (unrelated > or older versions). This buries them deep in the mailbox and might > interfere with applying entire sets. > > > Applying: w1: Add missing newline and fix typos in w1_bus_master comment > Applying: w1: Add missing newline and fix typos in w1_bus_master comment > Patch failed at 0002 w1: Add missing newline and fix typos in > w1_bus_master comment > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > error: patch failed: include/linux/w1.h:85 > error: include/linux/w1.h: patch does not apply > hint: Use 'git am --show-current-patch=diff' to see the failed patch Hi Krzysztof, just to clarify: do you want me to submit the patch again or did you run "git am --skip" to skip the identical, but threaded resend? Thanks, Thorsten
Powered by blists - more mailing lists