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:
****************************************************************************
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.
diff --cc drivers/gpu/drm/drm_crtc_helper.c
index 887ed33,f914044..0000000
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@@ -34,12 -34,12 +34,21 @@@
#include "drm_crtc_helper.h"
/*
++<<<<<<< HEAD:drivers/gpu/drm/drm_crtc_helper.c
+ * Detailed mode info for a standard 640x...@60hz monitor
+ */
+static struct drm_display_mode std_mode[] = {
+ { DRM_MODE("640x480", DRM_MODE_TYPE_DEFAULT, 25200, 640, 656,
+ 752, 800, 0, 480, 490, 492, 525, 0,
+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) },
++=======
+ * Detailed mode info for 800x...@60hz
+ */
+ static struct drm_display_mode std_mode[] = {
+ { DRM_MODE("800x600", DRM_MODE_TYPE_DEFAULT, 40000, 800, 840,
+ 968, 1056, 0, 600, 601, 605, 628, 0,
+ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
++>>>>>>>
04a17f6119e332d74d2d0bb0ead6a31ff83300d8:drivers/gpu/drm/drm_crtc_helper.c
};
/**
diff --cc drivers/gpu/drm/drm_gem.c
index b3939de,9da5814..0000000
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@@ -516,7 -516,9 +516,13 @@@ int drm_gem_mmap(struct file *filp, str
vma->vm_private_data = map->handle;
/* FIXME: use pgprot_writecombine when available */
prot = pgprot_val(vma->vm_page_prot);
++<<<<<<< HEAD:drivers/gpu/drm/drm_gem.c
+ prot |= _PAGE_CACHE_WC;
++=======
+ #ifdef CONFIG_X86
+ prot |= _PAGE_CACHE_WC;
+ #endif
++>>>>>>> 04a17f6119e332d74d2d0bb0ead6a31ff83300d8:drivers/gpu/drm/drm_gem.c
vma->vm_page_prot = __pgprot(prot);
vma->vm_file = filp; /* Needed for drm_vm_open() */
diff --cc drivers/gpu/drm/drm_stub.c
index 592192d,5ca132a..0000000
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@@ -245,6 -245,7 +245,10 @@@ static int drm_fill_in_dev(struct drm_d
}
}
++<<<<<<< HEAD:drivers/gpu/drm/drm_stub.c
++=======
+
++>>>>>>> 04a17f6119e332d74d2d0bb0ead6a31ff83300d8:drivers/gpu/drm/drm_stub.c
retcode = drm_ctxbitmap_init(dev);
if (retcode) {
DRM_ERROR("Cannot allocate memory for context bitmap.\n");
@@@ -399,6 -400,7 +403,10 @@@ int drm_get_dev(struct pci_dev *pdev, c
driver->date, dev->primary->index);
return 0;
++<<<<<<< HEAD:drivers/gpu/drm/drm_stub.c
++=======
+
++>>>>>>> 04a17f6119e332d74d2d0bb0ead6a31ff83300d8:drivers/gpu/drm/drm_stub.c
err_g3:
drm_put_minor(&dev->primary);
err_g2:
diff --cc drivers/gpu/drm/i915/i915_gem.c
index 1cd5099,76056ca..0000000
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@@ -1368,6 -1368,8 +1368,11 @@@ i915_gem_evict_everything(struct drm_de
if (ret != 0)
break;
}
++<<<<<<< HEAD:drivers/gpu/drm/i915/i915_gem.c
++=======
+ if (ret == -ENOMEM)
+ return 0;
++>>>>>>>
04a17f6119e332d74d2d0bb0ead6a31ff83300d8:drivers/gpu/drm/i915/i915_gem.c
return ret;
}
@@@ -2496,6 -2498,7 +2501,10 @@@ i915_gem_execbuffer(struct drm_device *
/* unpin all of our buffers */
for (i = 0; i < pinned; i++)
i915_gem_object_unpin(object_list[i]);
++<<<<<<< HEAD:drivers/gpu/drm/i915/i915_gem.c
++=======
+ pinned = 0;
++>>>>>>>
04a17f6119e332d74d2d0bb0ead6a31ff83300d8:drivers/gpu/drm/i915/i915_gem.c
/* evict everyone we can from the aperture */
ret = i915_gem_evict_everything(dev);
diff --cc drivers/gpu/drm/i915/intel_fb.c
index a89ebea,bbf3e7f..0000000
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@@ -447,7 -447,7 +447,11 @@@ int intelfb_create(struct drm_device *d
mode_cmd.height = surface_height;
mode_cmd.bpp = 32;
++<<<<<<< HEAD:drivers/gpu/drm/i915/intel_fb.c
+ mode_cmd.pitch = mode_cmd.width * ((mode_cmd.bpp + 1) / 8);
++=======
+ mode_cmd.pitch = ALIGN(mode_cmd.width * ((mode_cmd.bpp + 1) / 8), 64);
++>>>>>>>
04a17f6119e332d74d2d0bb0ead6a31ff83300d8:drivers/gpu/drm/i915/intel_fb.c
mode_cmd.depth = 24;
size = mode_cmd.pitch * mode_cmd.height;
_______________________________________________
xorg mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/xorg
