From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Borntraeger <borntraeger@de•ibm.com>,
Cornelia Huck <cohuck@redhat•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Aaron Lewis <aaronlewis@google•com>,
Paolo Bonzini <pbonzini@redhat•com>,
Thomas Huth <thuth@redhat•com>
Subject: Re: linux-next: manual merge of the kvms390 tree with Linus' tree
Date: Tue, 9 Jul 2019 09:53:21 +1000 [thread overview]
Message-ID: <20190709095321.79175dfe@canb.auug.org.au> (raw)
In-Reply-To: <20190621154315.0a4d5f54@canb.auug.org.au>
[-- 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 --]
prev parent reply other threads:[~2019-07-08 23:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=20190709095321.79175dfe@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=aaronlewis@google$(echo .)com \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=cohuck@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pbonzini@redhat$(echo .)com \
--cc=thuth@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