* Upcoming merge conflict between s390 and kvm / kvms390 trees
@ 2022-03-10 18:06 Vasily Gorbik
2022-03-10 21:03 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Vasily Gorbik @ 2022-03-10 18:06 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux Next Mailing List, Heiko Carstens, Christian Borntraeger,
Paolo Bonzini
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Upcoming merge conflict between s390 and kvm / kvms390 trees
2022-03-10 18:06 Upcoming merge conflict between s390 and kvm / kvms390 trees Vasily Gorbik
@ 2022-03-10 21:03 ` Stephen Rothwell
2022-03-24 23:04 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2022-03-10 21:03 UTC (permalink / raw)
To: Vasily Gorbik
Cc: Linux Next Mailing List, Heiko Carstens, Christian Borntraeger,
Paolo Bonzini
[-- Attachment #1: Type: text/plain, Size: 1738 bytes --]
Hi Vasily,
On Thu, 10 Mar 2022 19:06:42 +0100 Vasily Gorbik <gor@linux•ibm.com> 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
>
> Thank you
Thanks for the heads up. I will do as you suggest.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Upcoming merge conflict between s390 and kvm / kvms390 trees
2022-03-10 21:03 ` Stephen Rothwell
@ 2022-03-24 23:04 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2022-03-24 23:04 UTC (permalink / raw)
To: Vasily Gorbik, Heiko Carstens
Cc: Linux Next Mailing List, Christian Borntraeger, Paolo Bonzini
[-- Attachment #1: Type: text/plain, Size: 1948 bytes --]
Hi all,
On Fri, 11 Mar 2022 08:03:50 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> On Thu, 10 Mar 2022 19:06:42 +0100 Vasily Gorbik <gor@linux•ibm.com> 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
> >
> > 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-24 23:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-10 18:06 Upcoming merge conflict between s390 and kvm / kvms390 trees Vasily Gorbik
2022-03-10 21:03 ` Stephen Rothwell
2022-03-24 23:04 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox