From: Daniel Vetter <daniel@ffwll.ch>
To: Lukas Wunner <lukas@wunner.de>
Cc: Daniel Vetter <daniel@ffwll.ch>, Jonathan Corbet <corbet@lwn.net>,
Darren Hart <dvhart@linux.intel.com>,
dri-devel@lists.freedesktop.org,
platform-driver-x86@vger.kernel.org,
Bruno Premont <bonbons@linux-vserver.org>
Subject: Re: [PATCH v2 0/1] apple-gmux: Add initial documentation
Date: Mon, 11 Jan 2016 15:57:14 +0100 [thread overview]
Message-ID: <20160111145714.GX8076@phenom.ffwll.local> (raw)
In-Reply-To: <20160111130715.GA6172@wunner.de>
On Mon, Jan 11, 2016 at 02:07:15PM +0100, Lukas Wunner wrote:
> Hi Daniel,
>
> On Mon, Jan 11, 2016 at 08:03:18AM +0100, Daniel Vetter wrote:
> > On Mon, Jan 11, 2016 at 12:08:35AM +0100, Lukas Wunner wrote:
> > > Here's a v2, the only change is Bruno Pr?mont's addition to the commit
> > > message.
> > >
> > > @Daniel Vetter: Could you pick this up for topic/drm-misc please?
> >
> > I think it makes more sense to pull this in through Darren's tree, and I
> > acked that on the last round already.
>
> As I've written in the cover letter of v1, this will provoke merge
> conflicts going forward since I'll post a new version of my GPU switching
> patches for the MacBook Pro this week which also touch apple-gmux and
> are based on this docs patch.
>
> I guess alternatively the patches touching vga_switcheroo and the DRM
> drivers could go in via pdx86, I'll cross-post to both lists to keep
> this option open, though I expect this might also lead to merge conflicts
> if relevant portions of the DRM drivers are changed in drm-next for 4.6.
>
> I still believe merging this via drm-next or drm-intel/topic/drm-misc
> would be the option least prone to merge conflicts.
Ah sorry, forgot about that again. Indeed that makes sense if other stuff
is pending, so applied to drm-misc for 4.6.
Cheers, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2016-01-11 14:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-10 23:08 [PATCH v2 0/1] apple-gmux: Add initial documentation Lukas Wunner
2016-01-10 23:08 ` [PATCH v2 1/1] " Lukas Wunner
2016-01-11 7:03 ` [PATCH v2 0/1] " Daniel Vetter
2016-01-11 13:07 ` Lukas Wunner
2016-01-11 14:57 ` Daniel Vetter [this message]
2016-01-11 17:45 ` Darren Hart
2016-01-11 19:19 ` Lukas Wunner
2016-01-11 19:26 ` Darren Hart
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=20160111145714.GX8076@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=bonbons@linux-vserver.org \
--cc=corbet@lwn.net \
--cc=dri-devel@lists.freedesktop.org \
--cc=dvhart@linux.intel.com \
--cc=lukas@wunner.de \
--cc=platform-driver-x86@vger.kernel.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