Re: [PATCH 2/2] sh: boot: avoid unneeded rebuilds under arch/sh/boot/compressed/

[John Paul Adrian Glaubitz]

Hi Masahiro!

On 1/17/21 5:21 PM, Masahiro Yamada wrote:
>> This patch doesn't apply for me while the first one applies without problems:
>>
>> glaubitz@epyc:..glaubitz/linux-git> git am ../sh-patches-2021/\[PATCH\ 1_2\]\ sh\:\ boot\:\ add\ intermediate\ vmlinux.bin\*\ to\ targets\ instead\ of\ extra-y.eml
>> Applying: sh: boot: add intermediate vmlinux.bin* to targets instead of extra-y
>> glaubitz@epyc:..glaubitz/linux-git> git am ../sh-patches-2021/\[PATCH\ 2_2\]\ sh\:\ boot\:\ avoid\ unneeded\ rebuilds\ under\ arch_sh_boot_compressed_.eml
>> Applying: sh: boot: avoid unneeded rebuilds under arch/sh/boot/compressed/
>> error: arch/sh/boot/compressed/ashiftrt.S: already exists in working directory
>> error: arch/sh/boot/compressed/ashldi3.c: already exists in working directory
>> error: arch/sh/boot/compressed/ashlsi3.S: already exists in working directory
>> error: arch/sh/boot/compressed/ashrsi3.S: already exists in working directory
>> error: arch/sh/boot/compressed/lshrsi3.S: already exists in working directory
> 
> Adrian, these 5 files are currently generated files.
> 
> That is why git-am failed.

I already guessed that. I removed them now and the patch applies cleanly.

Will test-boot on my SH-7785LCR in a minute.

> They are not cleaned up by 'make ARCH=sh clean'
> (this is a bug too).

That should be easy to fix I guess :-).

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@xxxxxxxxxx
`. `'   Freie Universitaet Berlin - glaubitz@xxxxxxxxxxxxxxxxxxx
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913