2 questions about git and merging

2015-05-27 Thread Dave Airlie
On 27 May 2015 at 01:17, Jani Nikula wrote: > On Tue, 26 May 2015, Daniel Vetter wrote: >> On Tue, May 26, 2015 at 03:09:04PM +0200, Rainer Koenig wrote: >>> Hi, >>> >>> a week ago I experienced problems on the skylake platform and got the >>> adivce to try out the drm-intel-nightly branch. I tri

2 questions about git and merging

2015-05-27 Thread Daniel Vetter
On Wed, May 27, 2015 at 09:24:31AM +0300, Jani Nikula wrote: > On Wed, 27 May 2015, Dave Airlie wrote: > > On 27 May 2015 at 01:17, Jani Nikula wrote: > >> On Tue, 26 May 2015, Daniel Vetter wrote: > >>> On Tue, May 26, 2015 at 03:09:04PM +0200, Rainer Koenig wrote: > Hi, > > a we

2 questions about git and merging

2015-05-27 Thread Jani Nikula
On Wed, 27 May 2015, Dave Airlie wrote: > On 27 May 2015 at 01:17, Jani Nikula wrote: >> On Tue, 26 May 2015, Daniel Vetter wrote: >>> On Tue, May 26, 2015 at 03:09:04PM +0200, Rainer Koenig wrote: Hi, a week ago I experienced problems on the skylake platform and got the adiv

2 questions about git and merging

2015-05-27 Thread Rainer Koenig
Am 26.05.2015 um 17:17 schrieb Jani Nikula: > However we don't necessarily queue Skylake fixes to the current > development kernels through drm-intel-fixes/drm-fixes, as the Skylake > support there is anyway preliminary, the fix (I don't think we figured > out which exact commit it was, did we?) m

2 questions about git and merging

2015-05-27 Thread Rainer Koenig
Am 26.05.2015 um 16:04 schrieb Daniel Vetter: > -nigthly is a rebasing tree, git pull does the wrong thing for that. The > proper way to track rebasing branches is (assuming you have no local > patches that you want to keep): > > $ git fetch origin > $ git reset --hard @{upstream} Thank you for

2 questions about git and merging

2015-05-26 Thread Jani Nikula
On Tue, 26 May 2015, Daniel Vetter wrote: > On Tue, May 26, 2015 at 03:09:04PM +0200, Rainer Koenig wrote: >> Hi, >> >> a week ago I experienced problems on the skylake platform and got the >> adivce to try out the drm-intel-nightly branch. I tried and it was a >> success. >> >> So after the ini

2 questions about git and merging

2015-05-26 Thread Daniel Vetter
On Tue, May 26, 2015 at 03:09:04PM +0200, Rainer Koenig wrote: > Hi, > > a week ago I experienced problems on the skylake platform and got the > adivce to try out the drm-intel-nightly branch. I tried and it was a > success. > > So after the initial "git clone" of the tree I tried to keep updated

2 questions about git and merging

2015-05-26 Thread Rainer Koenig
Hi, a week ago I experienced problems on the skylake platform and got the adivce to try out the drm-intel-nightly branch. I tried and it was a success. So after the initial "git clone" of the tree I tried to keep updated by doing a "git pull" from time to time, but what's really strange is that I