[v1,1/1] scripts: merge_config: Fix typo in variable name.

Message ID 20230322085106.16629-1-mirsad.todorovac@alu.unizg.hr
State New
Headers
Series [v1,1/1] scripts: merge_config: Fix typo in variable name. |

Commit Message

Mirsad Todorovac March 22, 2023, 8:51 a.m. UTC
  ${WARNOVERRIDE} was misspelled as ${WARNOVVERIDE}, which caused a shell
syntax error in certain paths of the script execution.

Cc: Mark Brown <broonie@kernel.org>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-of-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>
---
 scripts/kconfig/merge_config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Mark Brown March 22, 2023, 1:18 p.m. UTC | #1
On Wed, Mar 22, 2023 at 09:51:07AM +0100, Mirsad Goran Todorovac wrote:
> ${WARNOVERRIDE} was misspelled as ${WARNOVVERIDE}, which caused a shell
> syntax error in certain paths of the script execution.

Reviewed-by: Mark Brown <broonie@kernel.org>

Sorry about that.
  
Mirsad Todorovac March 22, 2023, 2:26 p.m. UTC | #2
On 3/22/2023 14:18, Mark Brown wrote:
> On Wed, Mar 22, 2023 at 09:51:07AM +0100, Mirsad Goran Todorovac wrote:
>> ${WARNOVERRIDE} was misspelled as ${WARNOVVERIDE}, which caused a shell
>> syntax error in certain paths of the script execution.
> 
> Reviewed-by: Mark Brown <broonie@kernel.org>
> 
> Sorry about that.

You shouldn't be. Errare humanum est.

I had worse blunders in the last couple of months, i.e.
setting chattr +a on log files until /var/log filled up (old logs couldn't
have been rotated).

Best regards,
Mirsad
  
Randy Dunlap March 22, 2023, 3:20 p.m. UTC | #3
On 3/22/23 01:51, Mirsad Goran Todorovac wrote:
> ${WARNOVERRIDE} was misspelled as ${WARNOVVERIDE}, which caused a shell
> syntax error in certain paths of the script execution.
> 

Fixes: 46dff8d7e381e ("scripts: merge_config: Add option to suppress warning on overrides")

Acked-by: Randy Dunlap <rdunlap@infradead.org>

Thanks.

> Cc: Mark Brown <broonie@kernel.org>
> Cc: Masahiro Yamada <masahiroy@kernel.org>
> Cc: linux-kbuild@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Signed-of-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>
> ---
>  scripts/kconfig/merge_config.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
> index 32620de473ad..902eb429b9db 100755
> --- a/scripts/kconfig/merge_config.sh
> +++ b/scripts/kconfig/merge_config.sh
> @@ -145,7 +145,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
>  		NEW_VAL=$(grep -w $CFG $MERGE_FILE)
>  		BUILTIN_FLAG=false
>  		if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then
> -			${WARNOVVERIDE} Previous  value: $PREV_VAL
> +			${WARNOVERRIDE} Previous  value: $PREV_VAL
>  			${WARNOVERRIDE} New value:       $NEW_VAL
>  			${WARNOVERRIDE} -y passed, will not demote y to m
>  			${WARNOVERRIDE}
  
Mirsad Todorovac March 22, 2023, 6:14 p.m. UTC | #4
On 22. 03. 2023. 16:20, Randy Dunlap wrote:
> 
> 
> On 3/22/23 01:51, Mirsad Goran Todorovac wrote:
>> ${WARNOVERRIDE} was misspelled as ${WARNOVVERIDE}, which caused a shell
>> syntax error in certain paths of the script execution.
>>
> 
> Fixes: 46dff8d7e381e ("scripts: merge_config: Add option to suppress warning on overrides")
> 
> Acked-by: Randy Dunlap <rdunlap@infradead.org>
> 
> Thanks.

Hi, Randy,

I think this time thanks go to the Heavens, for preserving my physical integrity.

Though I don't know of a bike with ABS.

>> Cc: Mark Brown <broonie@kernel.org>
>> Cc: Masahiro Yamada <masahiroy@kernel.org>
>> Cc: linux-kbuild@vger.kernel.org
>> Cc: linux-kernel@vger.kernel.org
>> Signed-of-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>
>> ---
>>  scripts/kconfig/merge_config.sh | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
>> index 32620de473ad..902eb429b9db 100755
>> --- a/scripts/kconfig/merge_config.sh
>> +++ b/scripts/kconfig/merge_config.sh
>> @@ -145,7 +145,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
>>  		NEW_VAL=$(grep -w $CFG $MERGE_FILE)
>>  		BUILTIN_FLAG=false
>>  		if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then
>> -			${WARNOVVERIDE} Previous  value: $PREV_VAL
>> +			${WARNOVERRIDE} Previous  value: $PREV_VAL
>>  			${WARNOVERRIDE} New value:       $NEW_VAL
>>  			${WARNOVERRIDE} -y passed, will not demote y to m
>>  			${WARNOVERRIDE}

Best regards,
Mirsad
  
Masahiro Yamada March 23, 2023, 6:24 a.m. UTC | #5
On Thu, Mar 23, 2023 at 3:15 AM Mirsad Goran Todorovac
<mirsad.todorovac@alu.unizg.hr> wrote:
>
> On 22. 03. 2023. 16:20, Randy Dunlap wrote:
> >
> >
> > On 3/22/23 01:51, Mirsad Goran Todorovac wrote:
> >> ${WARNOVERRIDE} was misspelled as ${WARNOVVERIDE}, which caused a shell
> >> syntax error in certain paths of the script execution.
> >>
> >
> > Fixes: 46dff8d7e381e ("scripts: merge_config: Add option to suppress warning on overrides")
> >
> > Acked-by: Randy Dunlap <rdunlap@infradead.org>
> >
> > Thanks.
>
> Hi, Randy,
>
> I think this time thanks go to the Heavens, for preserving my physical integrity.
>
> Though I don't know of a bike with ABS.




Applied to linux-kbuild/fixes,
fixing another typo "Signed-of-by".


You do not need to spell it out by yourself.

"git commit -s" will insert the Signed-off-by tag.







> >> Cc: Mark Brown <broonie@kernel.org>
> >> Cc: Masahiro Yamada <masahiroy@kernel.org>
> >> Cc: linux-kbuild@vger.kernel.org
> >> Cc: linux-kernel@vger.kernel.org
> >> Signed-of-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>
> >> ---
> >>  scripts/kconfig/merge_config.sh | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
> >> index 32620de473ad..902eb429b9db 100755
> >> --- a/scripts/kconfig/merge_config.sh
> >> +++ b/scripts/kconfig/merge_config.sh
> >> @@ -145,7 +145,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
> >>              NEW_VAL=$(grep -w $CFG $MERGE_FILE)
> >>              BUILTIN_FLAG=false
> >>              if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then
> >> -                    ${WARNOVVERIDE} Previous  value: $PREV_VAL
> >> +                    ${WARNOVERRIDE} Previous  value: $PREV_VAL
> >>                      ${WARNOVERRIDE} New value:       $NEW_VAL
> >>                      ${WARNOVERRIDE} -y passed, will not demote y to m
> >>                      ${WARNOVERRIDE}
>
> Best regards,
> Mirsad
>
> --
> Mirsad Goran Todorovac
> Sistem inženjer
> Grafički fakultet | Akademija likovnih umjetnosti
> Sveučilište u Zagrebu
>
> System engineer
> Faculty of Graphic Arts | Academy of Fine Arts
> University of Zagreb, Republic of Croatia
> The European Union
>
  
Mirsad Todorovac March 23, 2023, 7:17 a.m. UTC | #6
On 23.3.2023. 7:24, Masahiro Yamada wrote:
> On Thu, Mar 23, 2023 at 3:15 AM Mirsad Goran Todorovac
> <mirsad.todorovac@alu.unizg.hr> wrote:
>>
>> On 22. 03. 2023. 16:20, Randy Dunlap wrote:
>>>
>>> On 3/22/23 01:51, Mirsad Goran Todorovac wrote:
>>>> ${WARNOVERRIDE} was misspelled as ${WARNOVVERIDE}, which caused a shell
>>>> syntax error in certain paths of the script execution.
>>>>
>>>
>>> Fixes: 46dff8d7e381e ("scripts: merge_config: Add option to suppress warning on overrides")
>>>
>>> Acked-by: Randy Dunlap <rdunlap@infradead.org>
>>>
>>> Thanks.
>>
>> Hi, Randy,
>>
>> I think this time thanks go to the Heavens, for preserving my physical integrity.
>>
>> Though I don't know of a bike with ABS.

> Applied to linux-kbuild/fixes,
> fixing another typo "Signed-of-by".
> 
> You do not need to spell it out by yourself.
> 
> "git commit -s" will insert the Signed-off-by tag.

Sorry to have wasted your time and effort. A typo fixing typo.

It is visually hard to detect once it's done. :(

I'm grateful for your quality control.

Best regards,
Mirsad

>>>> Cc: Mark Brown <broonie@kernel.org>
>>>> Cc: Masahiro Yamada <masahiroy@kernel.org>
>>>> Cc: linux-kbuild@vger.kernel.org
>>>> Cc: linux-kernel@vger.kernel.org
>>>> Signed-of-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>
>>>> ---
>>>>   scripts/kconfig/merge_config.sh | 2 +-
>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
>>>> index 32620de473ad..902eb429b9db 100755
>>>> --- a/scripts/kconfig/merge_config.sh
>>>> +++ b/scripts/kconfig/merge_config.sh
>>>> @@ -145,7 +145,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
>>>>               NEW_VAL=$(grep -w $CFG $MERGE_FILE)
>>>>               BUILTIN_FLAG=false
>>>>               if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then
>>>> -                    ${WARNOVVERIDE} Previous  value: $PREV_VAL
>>>> +                    ${WARNOVERRIDE} Previous  value: $PREV_VAL
>>>>                       ${WARNOVERRIDE} New value:       $NEW_VAL
>>>>                       ${WARNOVERRIDE} -y passed, will not demote y to m
>>>>                       ${WARNOVERRIDE}
  

Patch

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 32620de473ad..902eb429b9db 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -145,7 +145,7 @@  for ORIG_MERGE_FILE in $MERGE_LIST ; do
 		NEW_VAL=$(grep -w $CFG $MERGE_FILE)
 		BUILTIN_FLAG=false
 		if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then
-			${WARNOVVERIDE} Previous  value: $PREV_VAL
+			${WARNOVERRIDE} Previous  value: $PREV_VAL
 			${WARNOVERRIDE} New value:       $NEW_VAL
 			${WARNOVERRIDE} -y passed, will not demote y to m
 			${WARNOVERRIDE}