[SOLVED] Kernel development git question

twelveeighty · 2016-08-16 20:12:25

Not sure if this is in the wrong forum, but I'm trying to build a custom kernel to contribute/troubleshoot drm-intel issues on this laptop. I'm familiar with Git and development, just not with kernel development, so bear with me. I cloned the 'drm-intel-nightly' branch of git://anongit.freedesktop.org/drm-intel as instructed on the Intel website just last night. I did not make any changes to my local version since then. I ran a 'git pull' this morning and to my surprise there were merge conflicts. I didn't think that was possible unless I made local changes...? Or is this to be expected?

$ git pull
remote: Counting objects: 360, done.
remote: Compressing objects: 100% (159/159), done.
remote: Total 360 (delta 315), reused 240 (delta 201)
Receiving objects: 100% (360/360), 106.66 KiB | 0 bytes/s, done.
Resolving deltas: 100% (315/315), completed with 104 local objects.
From git://anongit.freedesktop.org/drm-intel
 + bc5705c...d93dacb drm-intel-nightly -> origin/drm-intel-nightly  (forced update)
   1544c42..ca99d87  drm-intel-next-queued -> origin/drm-intel-next-queued
   638544c..89f4870  rerere-cache -> origin/rerere-cache
   90844f0..5ee4c8f  topic/drm-misc -> origin/topic/drm-misc
Auto-merging integration-manifest
CONFLICT (add/add): Merge conflict in integration-manifest
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/i915_gem.c
Auto-merging drivers/gpu/drm/drm_crtc_helper_internal.h
Auto-merging Documentation/gpu/vgaarbiter.rst
Automatic merge failed; fix conflicts and then commit the result.

Last edited by twelveeighty (2016-08-16 20:59:22)

graysky · 2016-08-16 20:21:15

Not sure about your specific issue but why not build from the AUR (https://aur.archlinux.org/packages/linu … el-nightly)

twelveeighty · 2016-08-16 20:59:05

Wow - I looked but missed it in the AUR listing. That makes a lot more sense. Thanks!

eschwartz · 2016-08-17 02:47:14

Well, it is possible if you are set to auto-merge when pulling, and the remote branch had a forced update. (You can see from the "fetch" stage that drm-intel-nightly was indeed a forced update.)

By default this will happen.
Though I prefer to use the setting `git config --global pull.ff only` -- in which case you would get the message: "fatal: Not possible to fast-forward, aborting."

Last edited by eschwartz (2016-08-17 02:47:29)

Arch Linux

#1 2016-08-16 20:12:25

[SOLVED] Kernel development git question

#2 2016-08-16 20:21:15

Re: [SOLVED] Kernel development git question

#3 2016-08-16 20:59:05

Re: [SOLVED] Kernel development git question

#4 2016-08-17 02:47:14

Re: [SOLVED] Kernel development git question

Board footer