From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: David Miller <davem@davemloft.net>
Cc: jkosina@suse.cz, vitalivanov@gmail.com,
linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org
Subject: Re: sungem: fix compile failure caused by trivial #include consolidation
Date: Fri, 29 Jul 2011 18:22:37 +0400 [thread overview]
Message-ID: <1311949357.8190.40.camel@mulgrave> (raw)
In-Reply-To: <20110729.071710.1864654661956416171.davem@davemloft.net>
On Fri, 2011-07-29 at 07:17 -0700, David Miller wrote:
> From: Jiri Kosina <jkosina@suse.cz>
> Date: Fri, 29 Jul 2011 16:11:54 +0200 (CEST)
>
> > On Fri, 29 Jul 2011, James Bottomley wrote:
> >
> >> This patch:
> >>
> >> commit e44ba033c5654dbfda53461c9b1f7dd9bd1d198f
> >> Author: Vitaliy Ivanov <vitalivanov@gmail.com>
> >> Date: Mon Jun 20 16:08:07 2011 +0200
> >>
> >> treewide: remove duplicate includes
> >>
> >> Causes this compile failure on parisc:
> >>
> >> CC [M] drivers/net/sungem.o
> >> drivers/net/sungem.c:49:22: error: asm/prom.h: No such file or directory
> >> make[2]: *** [drivers/net/sungem.o] Error 1
> >>
> >> Only Sparc and PPC actually have the asm/prom.h include, so you can't
> >> consolidate it outside of the ifdefs.
> >>
> >> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
> >>
> >> ---
> >>
> >> This really shouldn't be happening with a trivial patch, since it's an
> >> obviously non-trivial transformation ... I assume the duplicate include
> >> checker isn't taking #ifdefs into account?
> >
> > Ah, right. I am afraid this was simply overlooked. David, do you want me
> > to take this, or will you fix that up in your tree? (I am fine either
> > way).
>
> Take what, although James signed off he seemd to simply repost your
> patch again rather than a fix, unless I'm reading it wrong :-)
Oh, yes ... I applied it with patch -R, since I was finding the bit to
revert. Sorry,
James
> But yeah once there is a fix please push it.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2011-07-29 14:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-29 14:08 sungem: fix compile failure caused by trivial #include consolidation James Bottomley
2011-07-29 14:11 ` Jiri Kosina
2011-07-29 14:17 ` David Miller
2011-07-29 14:22 ` Jiri Kosina
2011-07-29 14:22 ` James Bottomley [this message]
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=1311949357.8190.40.camel@mulgrave \
--to=james.bottomley@hansenpartnership.com \
--cc=davem@davemloft.net \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=vitalivanov@gmail.com \
/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