From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Bill Pemberton <wfp5p@virginia.edu>
Subject: Re: linux-next: build failure after merge of the omap_dss2 tree
Date: Tue, 4 Mar 2014 08:58:31 +0200 [thread overview]
Message-ID: <53157997.8000408@ti.com> (raw)
In-Reply-To: <20140304143543.4ab2321f14a61d84bb63b692@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1772 bytes --]
On 04/03/14 05:35, Stephen Rothwell wrote:
> Hi Tomi,
>
> After merging the omap_dss2 tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from drivers/staging/xgifb/XGIfb.h:3:0,
> from drivers/staging/xgifb/vb_init.c:4:
> drivers/staging/xgifb/vgatypes.h:5:38: fatal error: ../../video/sis/vgatypes.h: No such file or directory
> #include "../../video/sis/vgatypes.h"
> ^
> In file included from drivers/staging/xgifb/XGIfb.h:3:0,
> from drivers/staging/xgifb/vb_setmode.c:2:
> drivers/staging/xgifb/vgatypes.h:5:38: fatal error: ../../video/sis/vgatypes.h: No such file or directory
> #include "../../video/sis/vgatypes.h"
> ^
> In file included from drivers/staging/xgifb/vb_util.c:1:0:
> drivers/staging/xgifb/vgatypes.h:5:38: fatal error: ../../video/sis/vgatypes.h: No such file or directory
> #include "../../video/sis/vgatypes.h"
> ^
> In file included from drivers/staging/xgifb/XGIfb.h:3:0,
> from drivers/staging/xgifb/XGI_main.h:4,
> from drivers/staging/xgifb/XGI_main_26.c:16:
> drivers/staging/xgifb/vgatypes.h:5:38: fatal error: ../../video/sis/vgatypes.h: No such file or directory
> #include "../../video/sis/vgatypes.h"
> ^
>
> Caused by commit 08667731d1d4 ("video: move fbdev to
> drivers/video/fbdev").
>
> I have applied this merge fix patch (you should add it to your tree):
Thanks. I forgot we may have fbdev drivers in staging... This is now
fixed in my for-next branch (along with a couple of others, found by the
kbuild bot).
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, <linux-next@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Bill Pemberton <wfp5p@virginia.edu>
Subject: Re: linux-next: build failure after merge of the omap_dss2 tree
Date: Tue, 4 Mar 2014 08:58:31 +0200 [thread overview]
Message-ID: <53157997.8000408@ti.com> (raw)
In-Reply-To: <20140304143543.4ab2321f14a61d84bb63b692@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1772 bytes --]
On 04/03/14 05:35, Stephen Rothwell wrote:
> Hi Tomi,
>
> After merging the omap_dss2 tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from drivers/staging/xgifb/XGIfb.h:3:0,
> from drivers/staging/xgifb/vb_init.c:4:
> drivers/staging/xgifb/vgatypes.h:5:38: fatal error: ../../video/sis/vgatypes.h: No such file or directory
> #include "../../video/sis/vgatypes.h"
> ^
> In file included from drivers/staging/xgifb/XGIfb.h:3:0,
> from drivers/staging/xgifb/vb_setmode.c:2:
> drivers/staging/xgifb/vgatypes.h:5:38: fatal error: ../../video/sis/vgatypes.h: No such file or directory
> #include "../../video/sis/vgatypes.h"
> ^
> In file included from drivers/staging/xgifb/vb_util.c:1:0:
> drivers/staging/xgifb/vgatypes.h:5:38: fatal error: ../../video/sis/vgatypes.h: No such file or directory
> #include "../../video/sis/vgatypes.h"
> ^
> In file included from drivers/staging/xgifb/XGIfb.h:3:0,
> from drivers/staging/xgifb/XGI_main.h:4,
> from drivers/staging/xgifb/XGI_main_26.c:16:
> drivers/staging/xgifb/vgatypes.h:5:38: fatal error: ../../video/sis/vgatypes.h: No such file or directory
> #include "../../video/sis/vgatypes.h"
> ^
>
> Caused by commit 08667731d1d4 ("video: move fbdev to
> drivers/video/fbdev").
>
> I have applied this merge fix patch (you should add it to your tree):
Thanks. I forgot we may have fbdev drivers in staging... This is now
fixed in my for-next branch (along with a couple of others, found by the
kbuild bot).
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]
next prev parent reply other threads:[~2014-03-04 6:58 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-04 3:35 linux-next: build failure after merge of the omap_dss2 tree Stephen Rothwell
2014-03-04 6:58 ` Tomi Valkeinen [this message]
2014-03-04 6:58 ` Tomi Valkeinen
-- strict thread matches above, loose matches on Subject: below --
2014-11-17 8:09 Stephen Rothwell
2014-11-18 14:53 ` Tomi Valkeinen
2014-11-18 14:53 ` Tomi Valkeinen
2014-11-18 15:07 ` David Herrmann
2014-11-25 11:00 ` Tomi Valkeinen
2014-11-25 11:20 ` Hans de Goede
2014-11-25 12:11 ` Tomi Valkeinen
2014-11-25 22:07 ` Stephen Rothwell
2014-11-26 8:16 ` Tomi Valkeinen
2014-03-05 3:32 Stephen Rothwell
2014-03-05 7:01 ` Tomi Valkeinen
2014-03-05 7:01 ` Tomi Valkeinen
2013-04-26 5:10 Stephen Rothwell
2013-04-26 5:31 ` Tomi Valkeinen
2013-04-26 5:31 ` Tomi Valkeinen
2013-04-26 5:56 ` Stephen Rothwell
2013-04-26 5:56 ` Stephen Rothwell
2013-04-26 6:57 ` Tomi Valkeinen
2013-04-26 6:57 ` Tomi Valkeinen
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=53157997.8000408@ti.com \
--to=tomi.valkeinen@ti.com \
--cc=aaro.koskinen@iki.fi \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=wfp5p@virginia.edu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.