* linux-next: manual merge of the kvms390 tree with Linus' tree
@ 2019-06-21 5:43 Stephen Rothwell
2019-06-21 8:05 ` Cornelia Huck
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Stephen Rothwell @ 2019-06-21 5:43 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Aaron Lewis,
Paolo Bonzini, Thomas Huth
[-- Attachment #1: Type: text/plain, Size: 2979 bytes --]
Hi all,
Today's linux-next merge of the kvms390 tree got a conflict in:
tools/testing/selftests/kvm/Makefile
between commit:
61cfcd545e42 ("kvm: tests: Sort tests in the Makefile alphabetically")
from Linus' tree and commits:
ee1563f42856 ("KVM: selftests: Add the sync_regs test for s390x")
49fe9a5d1638 ("KVM: selftests: Move kvm_create_max_vcpus test to generic code")
from the kvms390 tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc tools/testing/selftests/kvm/Makefile
index 62afd0b43074,0d7265da1583..000000000000
--- a/tools/testing/selftests/kvm/Makefile
+++ b/tools/testing/selftests/kvm/Makefile
@@@ -10,25 -10,29 +10,30 @@@ UNAME_M := $(shell uname -m
LIBKVM = lib/assert.c lib/elf.c lib/io.c lib/kvm_util.c lib/ucall.c lib/sparsebit.c
LIBKVM_x86_64 = lib/x86_64/processor.c lib/x86_64/vmx.c
LIBKVM_aarch64 = lib/aarch64/processor.c
+ LIBKVM_s390x = lib/s390x/processor.c
-TEST_GEN_PROGS_x86_64 = x86_64/platform_info_test
-TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
-TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test
-TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test
-TEST_GEN_PROGS_x86_64 += x86_64/cr4_cpuid_sync_test
-TEST_GEN_PROGS_x86_64 += x86_64/state_test
+TEST_GEN_PROGS_x86_64 = x86_64/cr4_cpuid_sync_test
TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test
TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid
- TEST_GEN_PROGS_x86_64 += x86_64/kvm_create_max_vcpus
-TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
+TEST_GEN_PROGS_x86_64 += x86_64/mmio_warning_test
+TEST_GEN_PROGS_x86_64 += x86_64/platform_info_test
+TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
TEST_GEN_PROGS_x86_64 += x86_64/smm_test
+TEST_GEN_PROGS_x86_64 += x86_64/state_test
+TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test
+TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test
-TEST_GEN_PROGS_x86_64 += kvm_create_max_vcpus
-TEST_GEN_PROGS_x86_64 += dirty_log_test
+TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test
TEST_GEN_PROGS_x86_64 += clear_dirty_log_test
+TEST_GEN_PROGS_x86_64 += dirty_log_test
++TEST_GEN_PROGS_x86_64 += kvm_create_max_vcpus
-TEST_GEN_PROGS_aarch64 += dirty_log_test
TEST_GEN_PROGS_aarch64 += clear_dirty_log_test
+TEST_GEN_PROGS_aarch64 += dirty_log_test
+ TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus
+
+ TEST_GEN_PROGS_s390x += s390x/sync_regs_test
+ TEST_GEN_PROGS_s390x += kvm_create_max_vcpus
TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(UNAME_M))
LIBKVM += $(LIBKVM_$(UNAME_M))
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the kvms390 tree with Linus' tree
2019-06-21 5:43 linux-next: manual merge of the kvms390 tree with Linus' tree Stephen Rothwell
@ 2019-06-21 8:05 ` Cornelia Huck
2019-06-24 17:52 ` Christian Borntraeger
2019-07-08 23:53 ` Stephen Rothwell
2 siblings, 0 replies; 5+ messages in thread
From: Cornelia Huck @ 2019-06-21 8:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Christian Borntraeger, Linux Next Mailing List,
Linux Kernel Mailing List, Aaron Lewis, Paolo Bonzini,
Thomas Huth
[-- Attachment #1: Type: text/plain, Size: 962 bytes --]
On Fri, 21 Jun 2019 15:43:15 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> tools/testing/selftests/kvm/Makefile
>
> between commit:
>
> 61cfcd545e42 ("kvm: tests: Sort tests in the Makefile alphabetically")
>
> from Linus' tree and commits:
>
> ee1563f42856 ("KVM: selftests: Add the sync_regs test for s390x")
> 49fe9a5d1638 ("KVM: selftests: Move kvm_create_max_vcpus test to generic code")
>
> from the kvms390 tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
Thanks, looks good.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the kvms390 tree with Linus' tree
2019-06-21 5:43 linux-next: manual merge of the kvms390 tree with Linus' tree Stephen Rothwell
2019-06-21 8:05 ` Cornelia Huck
@ 2019-06-24 17:52 ` Christian Borntraeger
2019-06-24 22:08 ` Stephen Rothwell
2019-07-08 23:53 ` Stephen Rothwell
2 siblings, 1 reply; 5+ messages in thread
From: Christian Borntraeger @ 2019-06-24 17:52 UTC (permalink / raw)
To: Stephen Rothwell, Cornelia Huck
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Aaron Lewis,
Paolo Bonzini, Thomas Huth, Janosch Frank
Stephen,
can you replace Conny with
Janosch Frank <frankja@linux.ibm.com>
as contact fot kvms390-next?
Thanks
Christian
On 21.06.19 07:43, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> tools/testing/selftests/kvm/Makefile
>
> between commit:
>
> 61cfcd545e42 ("kvm: tests: Sort tests in the Makefile alphabetically")
>
> from Linus' tree and commits:
>
> ee1563f42856 ("KVM: selftests: Add the sync_regs test for s390x")
> 49fe9a5d1638 ("KVM: selftests: Move kvm_create_max_vcpus test to generic code")
>
> from the kvms390 tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the kvms390 tree with Linus' tree
2019-06-24 17:52 ` Christian Borntraeger
@ 2019-06-24 22:08 ` Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2019-06-24 22:08 UTC (permalink / raw)
To: Christian Borntraeger
Cc: Cornelia Huck, Linux Next Mailing List,
Linux Kernel Mailing List, Aaron Lewis, Paolo Bonzini,
Thomas Huth, Janosch Frank
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
Hi Christian,
On Mon, 24 Jun 2019 19:52:09 +0200 Christian Borntraeger <borntraeger@de.ibm.com> wrote:
>
> can you replace Conny with
>
> Janosch Frank <frankja@linux.ibm.com>
> as contact fot kvms390-next?
Done.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the kvms390 tree with Linus' tree
2019-06-21 5:43 linux-next: manual merge of the kvms390 tree with Linus' tree Stephen Rothwell
2019-06-21 8:05 ` Cornelia Huck
2019-06-24 17:52 ` Christian Borntraeger
@ 2019-07-08 23:53 ` Stephen Rothwell
2 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2019-07-08 23:53 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Aaron Lewis,
Paolo Bonzini, Thomas Huth
[-- Attachment #1: Type: text/plain, Size: 3374 bytes --]
Hi all,
On Fri, 21 Jun 2019 15:43:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> tools/testing/selftests/kvm/Makefile
>
> between commit:
>
> 61cfcd545e42 ("kvm: tests: Sort tests in the Makefile alphabetically")
>
> from Linus' tree and commits:
>
> ee1563f42856 ("KVM: selftests: Add the sync_regs test for s390x")
> 49fe9a5d1638 ("KVM: selftests: Move kvm_create_max_vcpus test to generic code")
>
> from the kvms390 tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc tools/testing/selftests/kvm/Makefile
> index 62afd0b43074,0d7265da1583..000000000000
> --- a/tools/testing/selftests/kvm/Makefile
> +++ b/tools/testing/selftests/kvm/Makefile
> @@@ -10,25 -10,29 +10,30 @@@ UNAME_M := $(shell uname -m
> LIBKVM = lib/assert.c lib/elf.c lib/io.c lib/kvm_util.c lib/ucall.c lib/sparsebit.c
> LIBKVM_x86_64 = lib/x86_64/processor.c lib/x86_64/vmx.c
> LIBKVM_aarch64 = lib/aarch64/processor.c
> + LIBKVM_s390x = lib/s390x/processor.c
>
> -TEST_GEN_PROGS_x86_64 = x86_64/platform_info_test
> -TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
> -TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test
> -TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test
> -TEST_GEN_PROGS_x86_64 += x86_64/cr4_cpuid_sync_test
> -TEST_GEN_PROGS_x86_64 += x86_64/state_test
> +TEST_GEN_PROGS_x86_64 = x86_64/cr4_cpuid_sync_test
> TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test
> TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid
> - TEST_GEN_PROGS_x86_64 += x86_64/kvm_create_max_vcpus
> -TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
> +TEST_GEN_PROGS_x86_64 += x86_64/mmio_warning_test
> +TEST_GEN_PROGS_x86_64 += x86_64/platform_info_test
> +TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
> TEST_GEN_PROGS_x86_64 += x86_64/smm_test
> +TEST_GEN_PROGS_x86_64 += x86_64/state_test
> +TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test
> +TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
> TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test
> -TEST_GEN_PROGS_x86_64 += kvm_create_max_vcpus
> -TEST_GEN_PROGS_x86_64 += dirty_log_test
> +TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test
> TEST_GEN_PROGS_x86_64 += clear_dirty_log_test
> +TEST_GEN_PROGS_x86_64 += dirty_log_test
> ++TEST_GEN_PROGS_x86_64 += kvm_create_max_vcpus
>
> -TEST_GEN_PROGS_aarch64 += dirty_log_test
> TEST_GEN_PROGS_aarch64 += clear_dirty_log_test
> +TEST_GEN_PROGS_aarch64 += dirty_log_test
> + TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus
> +
> + TEST_GEN_PROGS_s390x += s390x/sync_regs_test
> + TEST_GEN_PROGS_s390x += kvm_create_max_vcpus
>
> TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(UNAME_M))
> LIBKVM += $(LIBKVM_$(UNAME_M))
I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-07-08 23:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-21 5:43 linux-next: manual merge of the kvms390 tree with Linus' tree Stephen Rothwell
2019-06-21 8:05 ` Cornelia Huck
2019-06-24 17:52 ` Christian Borntraeger
2019-06-24 22:08 ` Stephen Rothwell
2019-07-08 23:53 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).