From: Masahiro Yamada <masahiroy@kernel.org>
To: Michal Simek <michal.simek@xilinx.com>
Cc: Randy Dunlap <rdunlap@infradead.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-kbuild <linux-kbuild@vger.kernel.org>,
Michal Simek <monstr@monstr.eu>
Subject: Re: [PATCH] microblaze: fix kbuild redundant file warning
Date: Tue, 1 Sep 2020 01:22:58 +0900 [thread overview]
Message-ID: <CAK7LNARfGY_o25mfB-QyQ5ezQW00OMPpbsN+be8LF_mojX39yA@mail.gmail.com> (raw)
In-Reply-To: <f7ce291e-47be-549b-7163-0744e7ea35d5@xilinx.com>
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
next prev parent reply other threads:[~2020-08-31 16:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-28 18:35 [PATCH] microblaze: fix kbuild redundant file warning Randy Dunlap
2020-08-29 6:28 ` Masahiro Yamada
2020-08-31 14:01 ` Michal Simek
2020-08-31 16:22 ` Masahiro Yamada [this message]
2020-08-31 16:33 ` Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAK7LNARfGY_o25mfB-QyQ5ezQW00OMPpbsN+be8LF_mojX39yA@mail.gmail.com \
--to=masahiroy@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=monstr@monstr.eu \
--cc=rdunlap@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).