On 8/31/20 9:22 AM, Masahiro Yamada wrote:
> On Mon, Aug 31, 2020 at 11:01 PM Michal Simek <michal.simek@xxxxxxxxxx> wrote:
>>
>> Hi,
>>
>> On 28. 08. 20 20:35, Randy Dunlap wrote:
>>> From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
>>>
>>> Fix build warning since this file is already listed in
>>> include/asm-generic/Kbuild.
>>>
>>> ../scripts/Makefile.asm-generic:25: redundant generic-y found in arch/microblaze/include/asm/Kbuild: hw_irq.h
>>>
>>> Fixes: 7e8f54cd4e26 ("microblaze: Remove empty headers")
>>
>> The patch is fine but this commit is wrong one. At that time
>> asm-generic/Kbuild didn't contain hw_irq.h as mandatory
>>
>> The commit 630f289b7114c0e68519cbd634e2b7ec804ca8c5 added it.
>>
>> Masahiro: Can you please check?
>>
>> Thanks,
>> Michal
>
>
>
> Michal, you are right.
>
> $ git merge-base 7e8f54cd 630f289
> 7e8f54cd4e2628fada942fe9ba1fc46e99e94218
>
>
> 630f289 has 7e8f54cd
> as an ancestor.
>
>
> You did not do anything wrong.
> Me neither.
> Both sides submitted correct patches.
>
>
> One unfortunate thing occurred
> when 630f289 got in via akpm tree.
>
> Andrew Morton manages patches by
> quilt instead of git.
>
> He rebases patches before sending them to
> Linus in the MW, but does not check the
> rebased result.
>
>
> You can replace the tag with:
>
> Fixes: 630f289b7114 ("asm-generic: make more kernel-space headers mandatory")
Thanks to both of you.
I'll resend the patch.
--
~Randy
