From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [Intel-gfx] frequent x crashes with gen6/sna Date: Mon, 17 Oct 2011 19:46:40 +0200 Message-ID: <20111017174640.GI2971@phenom.ffwll.local> References: <20111017123721.34230@gmx.net> <20111017131642.GE2971@phenom.ffwll.local> <20111017135403.266530@gmx.net> <20111017145023.GF2971@phenom.ffwll.local> <20111017151302.38170@gmx.net> <20111017154841.GG2971@phenom.ffwll.local> <20111017160156.38210@gmx.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20111017160156.38210-hi6Y0CQ0nG0@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libva-bounces+gcfl-libva=m.gmane.org-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Errors-To: libva-bounces+gcfl-libva=m.gmane.org-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org To: Dieter Mummenschanz Cc: intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, libva-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Oct 17, 2011 at 06:01:56PM +0200, Dieter Mummenschanz wrote: > Hi Daniel, > > ok I did a git clone git://anongit.freedesktop.org/libva (hope this is the right one?) and in the libva checkout I issued: > > git pull git://freedesktop.org/~danvet/libva-intel for-dieter > warning: no common commits > remote: Counting objects: 1632, done. > remote: Compressing objects: 100% (447/447), done. > remote: Total 1632 (delta 1174), reused 1632 (delta 1174) > Receiving objects: 100% (1632/1632), 617.29 KiB | 230 KiB/s, done. > Resolving deltas: 100% (1174/1174), done. > From git://freedesktop.org/~danvet/libva-intel > * branch for-dieter -> FETCH_HEAD > Auto-merging configure.ac > CONFLICT (add/add): Merge conflict in configure.ac > Auto-merging Makefile.am > CONFLICT (add/add): Merge conflict in Makefile.am > Auto-merging .gitignore > CONFLICT (add/add): Merge conflict in .gitignore > Automatic merge failed; fix conflicts and then commit the result. > > help! :-( Ok, I've given that git repo a head, so your usual git clone should work. Btw, you're sure you have the latest libva? It moved to http://cgit.freedesktop.org/vaapi/intel-driver/ Yours, Daniel -- Daniel Vetter Mail: daniel-/w4YWyX8dFk@public.gmane.org Mobile: +41 (0)79 365 57 48