Re: [git pull] drm tree for 4.2

2015-06-29 Thread Jani Nikula
On Mon, 29 Jun 2015, Ander Conselvan De Oliveira wrote: > On Fri, 2015-06-26 at 14:43 -0700, Linus Torvalds wrote: >> On Thu, Jun 25, 2015 at 6:00 PM, Dave Airlie wrote: >> > >> > This is the main drm pull request for v4.2. >> >> It seems to work ok for me, but it causes quite a few new

Re: [git pull] drm tree for 4.2

2015-06-29 Thread Ander Conselvan De Oliveira
On Fri, 2015-06-26 at 14:43 -0700, Linus Torvalds wrote: > On Thu, Jun 25, 2015 at 6:00 PM, Dave Airlie wrote: > > > > This is the main drm pull request for v4.2. > > It seems to work ok for me, but it causes quite a few new warnings on > my Sony VAIO Pro laptop. It's (once more) a regular

Re: [git pull] drm tree for 4.2

2015-06-29 Thread Ander Conselvan De Oliveira
On Fri, 2015-06-26 at 14:43 -0700, Linus Torvalds wrote: On Thu, Jun 25, 2015 at 6:00 PM, Dave Airlie airl...@linux.ie wrote: This is the main drm pull request for v4.2. It seems to work ok for me, but it causes quite a few new warnings on my Sony VAIO Pro laptop. It's (once more) a

Re: [git pull] drm tree for 4.2

2015-06-29 Thread Jani Nikula
On Mon, 29 Jun 2015, Ander Conselvan De Oliveira conselv...@gmail.com wrote: On Fri, 2015-06-26 at 14:43 -0700, Linus Torvalds wrote: On Thu, Jun 25, 2015 at 6:00 PM, Dave Airlie airl...@linux.ie wrote: This is the main drm pull request for v4.2. It seems to work ok for me, but it causes

Re: [git pull] drm tree for 4.2

2015-06-26 Thread Linus Torvalds
On Thu, Jun 25, 2015 at 6:00 PM, Dave Airlie wrote: > > This is the main drm pull request for v4.2. It seems to work ok for me, but it causes quite a few new warnings on my Sony VAIO Pro laptop. It's (once more) a regular i5-4200U CPU (aka Haswell, aka 4th gen Intel Core i5) Most of them are in

Re: [git pull] drm tree for 4.2

2015-06-26 Thread Linus Torvalds
On Fri, Jun 26, 2015 at 1:37 PM, Dave Airlie wrote: > > No generally Linus likes to do his own merges with hints from us. > > unless it's really tricky. Yup. And this time all the merges were trivial. My merge ended up differing from Dave's simply because of an ordering of statements that could

Re: [git pull] drm tree for 4.2

2015-06-26 Thread Dave Airlie
On 26 June 2015 at 18:05, Christian König 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

Re: [git pull] drm tree for 4.2

2015-06-26 Thread Linus Torvalds
On Fri, Jun 26, 2015 at 1:37 PM, Dave Airlie airl...@gmail.com wrote: No generally Linus likes to do his own merges with hints from us. unless it's really tricky. Yup. And this time all the merges were trivial. My merge ended up differing from Dave's simply because of an ordering of

Re: [git pull] drm tree for 4.2

2015-06-26 Thread Dave Airlie
On 26 June 2015 at 18:05, Christian König deathsim...@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

Re: [git pull] drm tree for 4.2

2015-06-26 Thread Linus Torvalds
On Thu, Jun 25, 2015 at 6:00 PM, Dave Airlie airl...@linux.ie wrote: This is the main drm pull request for v4.2. It seems to work ok for me, but it causes quite a few new warnings on my Sony VAIO Pro laptop. It's (once more) a regular i5-4200U CPU (aka Haswell, aka 4th gen Intel Core i5) Most