Hi, Whenever I attempt a git-pull in my local copy of drm-intel archive, branch drm-intel-next, (at branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel), I get merge conflict messages, specifically:
***************************************************************** Auto-merged drivers/gpu/drm/drm_bufs.c Auto-merged drivers/gpu/drm/drm_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_drv.c Auto-merged drivers/gpu/drm/drm_fops.c Auto-merged drivers/gpu/drm/i915/i915_dma.c Auto-merged drivers/gpu/drm/i915/i915_drv.c Auto-merged drivers/gpu/drm/i915/i915_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h 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/i915_gem_tiling.c Auto-merged drivers/gpu/drm/i915/i915_irq.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c Auto-merged drivers/gpu/drm/i915/i915_reg.h Removed drivers/video/omap/lcd_sx1.c Auto-merged include/drm/drm.h Auto-merged include/drm/drmP.h CONFLICT (content): Merge conflict in include/drm/drmP.h Auto-merged include/drm/i915_drm.h Automatic merge failed; fix conflicts and then commit the result. ***************************************************************** and if fact there are conflict messages in these files. Most of them are spurious, for example drm_drv.c has: ***************************************************************** <<<<<<< HEAD:drivers/gpu/drm/drm_drv.c if (dev->lock.hw_lock) { dev->sigdata.lock = dev->lock.hw_lock = NULL; /* SHM removed */ dev->lock.file_priv = NULL; wake_up_interruptible(&dev->lock.lock_queue); } ======= >>>>>>> b517fc41262dbf234b5bcaa419bf287b3cb1c1c4:drivers/gpu/drm/drm_drv.c ***************************************************************** However some are real. I can reset this with "git reset --hard HEAD" command. However I would like to update to the latest drm/i915 modules. Is my local copy likely to be corrupted in some way? Thanks in advance. _______________________________________________ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg