[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20210325120717.GA9273@debian>
Date: Thu, 25 Mar 2021 17:37:19 +0530
From: Bhaskar Chowdhury <unixbhaskar@...il.com>
To: Takashi Iwai <tiwai@...e.de>
Cc: perex@...ex.cz, tiwai@...e.com, broonie@...nel.org,
mirq-linux@...e.qmqm.pl, lars@...afoo.de, gustavoars@...nel.org,
huawei@...nel.org, alsa-devel@...a-project.org,
linux-kernel@...r.kernel.org, rdunlap@...radead.org
Subject: Re: [PATCH V3] ALSA: pcm: Fix couple of typos
On 11:47 Thu 25 Mar 2021, Takashi Iwai wrote:
>On Thu, 25 Mar 2021 10:56:39 +0100,
>Bhaskar Chowdhury wrote:
>>
>> On 10:37 Thu 25 Mar 2021, Takashi Iwai wrote:
>> >On Thu, 25 Mar 2021 10:06:09 +0100,
>> >Bhaskar Chowdhury wrote:
>> >>
>> >> s/unconditonally/unconditionally/
>> >> s/succesful/successful/
>> >>
>> >> Signed-off-by: Bhaskar Chowdhury <unixbhaskar@...il.com>
>> >> ---
>> >> Changes from V2:
>> >> Takashi pointed out that the patch was not applicable due to some unwanted
>> >> stuff get into it. Resending it with the new patch creation.
>> >
>> >Hrm, still not applicable. Can you apply the patch from your own post
>> >via git-am in your side?
>> >
>> Here is what I do for this specific case :
>>
>> ✔ ~/git-linux/linux-next [patch L|✔]
>> 15:18 $ sed -i 's/unconditonally/unconditionally/' sound/core/pcm_native.c
>> ✔ ~/git-linux/linux-next [patch L|✚ 1]
>> 15:19 $ sed -i 's/succesful/successful/' sound/core/pcm_native.c
>> ✔ ~/git-linux/linux-next [patch L|✚ 1]
>> 15:19 $ git add .
>> ✔ ~/git-linux/linux-next [patch L|●1]
>> 15:19 $ git ci "Fix some patch error"
>> [patch 88d5af187dbb] Fix some patch error
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> 15:21 $ git_fetch_single_file.sh sound/core/pcm_native.c
>> Looks alright!✔ ~/git-linux/linux-next [patch L|●1]
>> 15:21 $ git add .
>> ✔ ~/git-linux/linux-next [patch L|●1]
>> 15:21 $ git ci "Bring for patch"
>> [patch 352e1ce8dacf] Bring for patch
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> ✔ ~/git-linux/linux-next [patch L|✔]
>> 15:22 $ git apply --verbose 0001-Made-patche-for-this.patch
>> Checking patch sound/core/pcm_native.c...
>> Applied patch sound/core/pcm_native.c cleanly.
>
>I meant to try to apply the patch from mail fetched from the ML, not
>the patch you made from your git tree.
>
>
Hmmmmmm
bhaskar@...ian_16:18:41_Thu Mar 25 :~> mutt
Applying: ALSA: pcm: Fix couple of typos
error: corrupt patch at line 29
Patch failed at 0001 ALSA: pcm: Fix couple of typos
hint: Use 'git am --show-current-patch' 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".
Press any key to continue...
Something bugging it ....
>Takashi
Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)
Powered by blists - more mailing lists