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. Thanks, Lukas -- To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
