Re: [RFC v3 03/12] Add picosat.c (2/3)

Thorsten Berger
2021-10-24T23:52:39Z

On 24.10.2021 11:05, Masahiro Yamada wrote:
> On Fri, Oct 22, 2021 at 10:38 PM Thorsten Berger <thorsten.berger@rub.de> wrote:
>> The second part of picosat.c
>>
>> ---
>
> Most of the patches in this series are corrupted.
>
> Both 'git am' and 'patch' failed.
>
> masahiro@grover:~/workspace/linux-kbuild$ git am
> ~/Downloads/RFC-v3-03-12-Add-picosat.c-2-3.patch
> Applying: Add picosat.c (2/3)
> error: corrupt patch at line 10
> Patch failed at 0001 Add picosat.c (2/3)
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> 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".
>
>
> $ patch -p1 < ~/Downloads/RFC-v3-03-12-Add-picosat.c-2-3.patch
> patching file scripts/kconfig/picosat.c
> patch: **** malformed patch at line 82: {
>
>
>
>
>
> Each line of the diff context should begin with
> a space, '+', or '-'.
>
> But the offending line starts with 0xc2, 0xa0.
> Strange.
>
>
>
> Could you re-check the patch format and resend?
Thanks for working on it!

Sorry for that, we probably made some stupid beginner mistakes. Patrick Franz is looking into it.
> (or can you push your branch to somewhere?)
It's here: https://github.com/delta-one/linux/tree/configfix-next
>
> One more request:
>
> Please tell me which version of picosat
> (http://fmv.jku.at/picosat/) you imported.
Picosat 965
>
> Thanks.

Best, Thorsten