git problems with kernel drm repository

[Eric Anholt]

On Sun, 2008-12-14 at 10:36 +1100, garrone wrote:
> Hi. I am attempting to track the kernel drm driver git repository,
> branch drm-intel-next. To update, I change to the directory,
> ensure that the branch is set and the repository is clean,
> then pull from the remote repository. e.g.
> 
> ****************************************************************************
> $ git reset --hard HEAD
> HEAD is now at 8a04a92 drm/i915: Disable the GM965 MSI errata workaround.
> $ git status
> # On branch drm-intel-next
> nothing to commit (working directory clean)
> $ git pull
> ****************************************************************************
> 
> This gives conflict messages. Standard output is:

You don't do git pull on kernel repositories other than linus, because
we all have to rebase onto linus.  git fetch, then if you have nothing
of value in your branch, then git-reset --hard anholt/drm-intel-next.
Otherwise, git-rebase anholt/drm-intel-next and lots of git-rebase
--skip.

> ****************************************************************************
> Removed arch/mips/mti-malta/malta-mtd.c
> Auto-merged drivers/gpu/drm/drm_crtc_helper.c
> CONFLICT (add/add): Merge conflict in drivers/gpu/drm/drm_crtc_helper.c
> Auto-merged drivers/gpu/drm/drm_gem.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_gem.c
> Auto-merged drivers/gpu/drm/drm_stub.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_stub.c
> Auto-merged drivers/gpu/drm/i915/i915_gem.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
> Auto-merged drivers/gpu/drm/i915/intel_fb.c
> CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i915/intel_fb.c
> Auto-merged drivers/gpu/drm/radeon/radeon_drv.h
> ****************************************************************************
> 
> And error output is:
> 
> ****************************************************************************
> From git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
>  + fe9ab8f...04a17f6 drm-intel-next -> origin/drm-intel-next  (forced update)
>   * [new branch]      error-recovery -> origin/error-recovery
>   Automatic merge failed; fix conflicts and then commit the result.
> ****************************************************************************
> 
> If I do a git-diff, I get conflicts on the following drm files:
> drivers/gpu/drm/drm_crtc_helper.c
> drivers/gpu/drm/drm_gem.c
> drivers/gpu/drm/drm_stub.c
> drivers/gpu/drm/i915/i915_gem.c
> drivers/gpu/drm/i915/intel_fb.c
> 
> I have attached the diff output. I know nothing about these modifications.
> 
> If anyone could tell me a sequence of commands to repair my copy,
> and how to track future updates without these problems,
> would be grateful.
> _______________________________________________
> xorg mailing list
> xorg at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/xorg
-- 
Eric Anholt
eric at anholt.net                         eric.anholt at intel.com


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg/attachments/20081213/a4c6bddc/attachment.pgp>