[PATCH] microblaze: fix kbuild redundant file warning

[PATCH] microblaze: fix kbuild redundant file warning

[Randy Dunlap]

From: Randy Dunlap <rdunlap@infradead.org>

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")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Masahiro Yamada <masahiroy@kernel.org>
---
 arch/microblaze/include/asm/Kbuild |    1 -
 1 file changed, 1 deletion(-)

--- linux-next-20200825.orig/arch/microblaze/include/asm/Kbuild
+++ linux-next-20200825/arch/microblaze/include/asm/Kbuild
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 generated-y += syscall_table.h
 generic-y += extable.h
-generic-y += hw_irq.h
 generic-y += kvm_para.h
 generic-y += local64.h
 generic-y += mcs_spinlock.h

Re: [PATCH] microblaze: fix kbuild redundant file warning

[Masahiro Yamada]

On Sat, Aug 29, 2020 at 3:35 AM Randy Dunlap <rdunlap@infradead.org> wrote:
>
> From: Randy Dunlap <rdunlap@infradead.org>
>
> 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")
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Michal Simek <monstr@monstr.eu>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Masahiro Yamada <masahiroy@kernel.org>

Reviewed-by: Masahiro Yamada <masahiroy@kernel.org>



> ---
>  arch/microblaze/include/asm/Kbuild |    1 -
>  1 file changed, 1 deletion(-)
>
> --- linux-next-20200825.orig/arch/microblaze/include/asm/Kbuild
> +++ linux-next-20200825/arch/microblaze/include/asm/Kbuild
> @@ -1,7 +1,6 @@
>  # SPDX-License-Identifier: GPL-2.0
>  generated-y += syscall_table.h
>  generic-y += extable.h
> -generic-y += hw_irq.h
>  generic-y += kvm_para.h
>  generic-y += local64.h
>  generic-y += mcs_spinlock.h
>


-- 
Best Regards
Masahiro Yamada

Re: [PATCH] microblaze: fix kbuild redundant file warning

[Michal Simek]

Hi,

On 28. 08. 20 20:35, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
> 
> 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

Re: [PATCH] microblaze: fix kbuild redundant file warning

[Masahiro Yamada]

On Mon, Aug 31, 2020 at 11:01 PM Michal Simek <michal.simek@xilinx.com> wrote:
>
> Hi,
>
> On 28. 08. 20 20:35, Randy Dunlap wrote:
> > From: Randy Dunlap <rdunlap@infradead.org>
> >
> > 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")


-- 
Best Regards
Masahiro Yamada

Re: [PATCH] microblaze: fix kbuild redundant file warning

[Randy Dunlap]

On 8/31/20 9:22 AM, Masahiro Yamada wrote:
> On Mon, Aug 31, 2020 at 11:01 PM Michal Simek <michal.simek@xilinx.com> wrote:
>>
>> Hi,
>>
>> On 28. 08. 20 20:35, Randy Dunlap wrote:
>>> From: Randy Dunlap <rdunlap@infradead.org>
>>>
>>> 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