26 Jun
2015
26 Jun
'15
8:37 p.m.
On 26 June 2015 at 18:05, Christian König deathsimple@vodafone.de wrote:
Hey Dave,
I'm not 100% sure, but didn't you wanted to send this pull request out for drm-next-merged instead of drm-next?
Cause I'm still getting merge conflicts when I try to merge 4.1 into drm-next.
No generally Linus likes to do his own merges with hints from us.
unless it's really tricky.
Dave.