From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: intel-gfx <intel-gfx@lists.freedesktop.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
linux-next <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the drm-intel-fixes tree
Date: Fri, 6 Jun 2014 08:45:07 +0200 [thread overview]
Message-ID: <CAKMK7uGxKrAQq7Gjfz7U-Aby2KbOfLbuZUY486VK98obXK0mPA@mail.gmail.com> (raw)
In-Reply-To: <20140606120315.6f2b1441@canb.auug.org.au>
On Fri, Jun 6, 2014 at 4:03 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-intel-fixes tree, today's linux-next build
> (x86_64 allmodconfig) failed like this:
>
>
> drivers/gpu/drm/i915/intel_fbdev.c: In function 'intel_fb_initial_config':
> drivers/gpu/drm/i915/intel_fbdev.c:392:4: error: implicit declaration of function 'drm_get_connector_name' [-Werror=implicit-function-declaration]
> DRM_DEBUG_KMS("using first mode listed on connector %s\n",
> ^
>
> This is just the error I reported yesterday against the drm and
> drm-intel trees, but migrated to the drm-intel-fixes tree. Your -fixes
> tree shoudl really only contain stuff that depend on Linus' trees ...
> but here it include all of yesterday's drm tree as well.
Should be fixed now since Dave pushed out the backmerge to drm-next
with the resolution.
I'm sorry about the mess this caused but Linus' interleaved merge
window has caused quite a havoc with my branch model here. But since I
have everything ready already and no outstanding fixes I've moved
drm-intel-fixes already over to track 3.17 and gather patches on top
of the all the work readied before the merge window.
> I have used the drm-intel-fixes tree from next-20140605 for today.
I think you should drop drm-intel-fixes until 3.16 is out and the
merge window properly public, otherwise this mess will repeat.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
next prev parent reply other threads:[~2014-06-06 6:45 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-06 2:03 linux-next: build failure after merge of the drm-intel-fixes tree Stephen Rothwell
2014-06-06 6:45 ` Daniel Vetter [this message]
2017-01-02 23:42 Stephen Rothwell
2017-01-03 2:59 ` Zhenyu Wang
2017-01-03 4:07 ` Stephen Rothwell
2017-01-03 4:48 ` Alex Williamson
2017-01-03 9:23 ` Zhenyu Wang
2017-10-10 7:03 Mark Brown
2017-10-11 8:51 ` Mark Brown
2018-05-29 9:26 Stephen Rothwell
2018-05-29 11:45 ` Joonas Lahtinen
2019-01-29 22:39 Stephen Rothwell
2020-01-20 21:34 Stephen Rothwell
2020-01-21 7:13 ` Joonas Lahtinen
2020-05-28 22:30 Stephen Rothwell
2020-06-15 23:39 Stephen Rothwell
2020-06-16 9:22 ` Joonas Lahtinen
2020-11-03 22:37 Stephen Rothwell
2020-11-04 0:25 ` Rodrigo Vivi
2022-01-31 22:27 Stephen Rothwell
2022-07-13 12:14 Stephen Rothwell
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=CAKMK7uGxKrAQq7Gjfz7U-Aby2KbOfLbuZUY486VK98obXK0mPA@mail.gmail.com \
--to=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).