From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Vasily Gorbik <gor@linux•ibm.com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Heiko Carstens <hca@linux•ibm.com>,
Christian Borntraeger <borntraeger@de•ibm.com>,
Paolo Bonzini <pbonzini@redhat•com>
Subject: Re: Upcoming merge conflict between s390 and kvm / kvms390 trees
Date: Fri, 11 Mar 2022 08:03:50 +1100 [thread overview]
Message-ID: <20220311080350.4869503e@canb.auug.org.au> (raw)
In-Reply-To: <your-ad-here.call-01646935602-ext-2264@work.hours>
[-- 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 --]
next prev parent reply other threads:[~2022-03-10 21:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-10 18:06 Upcoming merge conflict between s390 and kvm / kvms390 trees Vasily Gorbik
2022-03-10 21:03 ` Stephen Rothwell [this message]
2022-03-24 23:04 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220311080350.4869503e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=gor@linux$(echo .)ibm.com \
--cc=hca@linux$(echo .)ibm.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pbonzini@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox