CONFLICT (content): Merge conflict in scripts/kconfig/Makefile

Hello.

I'm trying to enable KVM virtualization on the Arm Chromebook using
KVM-tool. This is the tutorial where I'm reading how to do that :


https://community.arm.com/arm-community-blogs/b/architectures-and-processors-blog/posts/virtualization-on-the-chromebook-using-kvm-tool


Below you can see what I did and the error that I've got :


/home/marietto/Scrivania/Chromebook# git clone
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git

Cloning into 'linux-stable'...
remote: Enumerating objects: 11487511, done.
remote: Counting objects: 100% (3953/3953), done.
remote: Compressing objects: 100% (2263/2263), done.
remote: Total 11487511 (delta 2912), reused 2100 (delta 1686),
pack-reused 11483558
Ricezione degli oggetti: 100% (11487511/11487511), 4.47 GiB | 6.32 MiB/s, done.
Risoluzione dei delta: 100% (9170170/9170170), done.
Checking out files: 100% (80340/80340), done.

/home/marietto/Scrivania/Chromebook# cd linux-stable

/home/marietto/Scrivania/Chromebook/linux-stable# git checkout

Your branch is up to date with 'origin/master'.

/home/marietto/Scrivania/Chromebook/linux-stable# git checkout
origin/linux-5.4.y -b linux-5.4.y

Checking out files: 100% (72207/72207), done.
Branch 'linux-5.4.y' set up to track remote branch 'linux-5.4.y' from 'origin'.
Switched to a new branch 'linux-5.4.y'

/home/marietto/Scrivania/Chromebook/linux-stable# git remote add
kvm-tool https://github.com/penberg/linux-kvm.git


/home/marietto/Scrivania/Chromebook/linux-stable# git remote update

Fetching origin
Fetching kvm-tool
remote: Enumerating objects: 11257, done.
remote: Counting objects: 100% (676/676), done.
remote: Total 11257 (delta 675), reused 675 (delta 675), pack-reused 10581
Ricezione degli oggetti: 100% (11257/11257), 2.57 MiB | 8.98 MiB/s, done.
Risoluzione dei delta: 100% (7441/7441), completed with 36 local objects.
Da https://github.com/penberg/linux-kvm
 * [nuovo branch]              master     -> kvm-tool/master
 * [nuovo branch]              vga/core   -> kvm-tool/vga/core

/home/marietto/Scrivania/Chromebook/linux-stable# git merge kvm-tool/master

Auto-merging scripts/kconfig/Makefile
CONFLICT (content): Merge conflict in scripts/kconfig/Makefile
Auto-merging arch/x86/Kconfig
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at
least 30049 and retry the command.
Automatic Merge failed; fix the conflicts and run the commit of the result.

# git merge kvm-tool/master

error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.


this is the conflict I see inside the Makefile :


<<<<<<< HEAD
PHONY += xconfig gconfig menuconfig config localmodconfig
localyesconfig build_menuconfig build_nconfig build_gconfig
build_xconfig
PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig
update-po-config localmodconfig localyesconfig kvmconfig
>>>>>>> kvm-tool/master


Is there a chance to fix it ? thanks

-- 
Mario.

_______________________________________________
Kernelnewbies mailing list
[email protected]
https://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies