[Intel-gfx] frequent x crashes with gen6/sna

[Dieter Mummenschanz]

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! :-(

-------- Original-Nachricht --------
> Datum: Mon, 17 Oct 2011 17:48:41 +0200
> Von: Daniel Vetter <daniel at ffwll.ch>
> An: Dieter Mummenschanz <mummenschanz at gmx.net>
> CC: Daniel Vetter <daniel at ffwll.ch>, libva at lists.freedesktop.org, intel-gfx at lists.freedesktop.org
> Betreff: Re: [Intel-gfx] frequent x crashes with gen6/sna

> On Mon, Oct 17, 2011 at 05:13:02PM +0200, Dieter Mummenschanz wrote:
> > Hi Daniel,
> > 
> > something is odd with your git branch - or my git command:
> 
> It's a headless git repo with just branches. Go into your existing intel
> libva driver checkout, create a new branch and merge in my stuff with
> 
> git pull git://freedesktop.org/~danvet/libva-intel for-dieter
> 
> Cheers, Daniel
> 
> > git clone git://freedesktop.org/~danvet/libva-intel for-dieter
> > Cloning into for-dieter...
> > 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 | 266 KiB/s, done.
> > Resolving deltas: 100% (1174/1174), done.
> > warning: remote HEAD refers to nonexistent ref, unable to checkout

-- 
Empfehlen Sie GMX DSL Ihren Freunden und Bekannten und wir
belohnen Sie mit bis zu 50,- Euro! https://freundschaftswerbung.gmx.de