Skip to contentSkip to conversation

Upcoming merge conflict between s390 and kvm / kvms390 trees

DISCUSSION Vasily Gorbik 2 participants 3 messages Mar 10, 2022 – Mar 24, 2022 Linux-next tree

lore
Share & tools
lore
#0 lore raw

Hi Stephen,

updating s390 tree for linux-next today I had to include a change which is already present in kvm tree:

1a82f6ab2365 ("s390/uaccess: Add copy_from/to_user_key functions")

it will get conflicts in arch/s390/lib/uaccess.c with the changes from s390 tree now:

432b1cc78e98 ("s390/uaccess: Add copy_from/to_user_key functions") 4efd417f298b ("s390: raise minimum supported machine generation to z10") 731efc9613ee ("s390: convert ".insn" encoding to instruction names")

please simply take the version from s390 tree (removing bunch of code from arch/s390/lib/uaccess.c file).

So that with regular order of merges (s390/for-next comes before kvm/next) kvm/next merge will not bring any new changes to arch/s390/lib/uaccess.c

cat Next/merge.log | grep -i 'Merge .*\(kvm\|s390\)' | grep -v arm

$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next

Thank you

#1 lore raw

Hi Vasily,

Quoted 20 lines · On Thu, 10 Mar 2022 19:06:42 +0100 Vasily Gorbik <[email protected]> wrote:

updating s390 tree for linux-next today I had to include a change which is already present in kvm tree:

1a82f6ab2365 ("s390/uaccess: Add copy_from/to_user_key functions")

it will get conflicts in arch/s390/lib/uaccess.c with the changes from s390 tree now:

432b1cc78e98 ("s390/uaccess: Add copy_from/to_user_key functions") 4efd417f298b ("s390: raise minimum supported machine generation to z10") 731efc9613ee ("s390: convert ".insn" encoding to instruction names")

please simply take the version from s390 tree (removing bunch of code from arch/s390/lib/uaccess.c file).

So that with regular order of merges (s390/for-next comes before kvm/next) kvm/next merge will not bring any new changes to arch/s390/lib/uaccess.c

cat Next/merge.log | grep -i 'Merge .*\(kvm\|s390\)' | grep -v arm

Quoted 8 lines
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next

Thank you

Thanks for the heads up. I will do as you suggest.

Signature · 2 lines
Cheers,
Stephen Rothwell
#2 lore raw

Hi all,

Quoted 29 lines · On Fri, 11 Mar 2022 08:03:50 +1100 Stephen Rothwell <[email protected]>…
Quoted 27 lines · On Thu, 10 Mar 2022 19:06:42 +0100 Vasily Gorbik <[email protected]> wrote:

updating s390 tree for linux-next today I had to include a change which is already present in kvm tree:

1a82f6ab2365 ("s390/uaccess: Add copy_from/to_user_key functions")

it will get conflicts in arch/s390/lib/uaccess.c with the changes from s390 tree now:

432b1cc78e98 ("s390/uaccess: Add copy_from/to_user_key functions") 4efd417f298b ("s390: raise minimum supported machine generation to z10") 731efc9613ee ("s390: convert ".insn" encoding to instruction names")

please simply take the version from s390 tree (removing bunch of code from arch/s390/lib/uaccess.c file).

So that with regular order of merges (s390/for-next comes before kvm/next) kvm/next merge will not bring any new changes to arch/s390/lib/uaccess.c

cat Next/merge.log | grep -i 'Merge .*\(kvm\|s390\)' | grep -v arm

$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next
Quoted 3 lines
Quoted 1 line

Thank you

Thanks for the heads up. I will do as you suggest.

This is now a conflict between the s390 tree and Linus' tree.

Signature · 2 lines
Cheers,
Stephen Rothwell