From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Anup Patel <anup@brainfault•org>,
Christoffer Dall <cdall@cs•columbia.edu>,
Marc Zyngier <maz@kernel•org>
Cc: Colin Ian King <colin.i.king@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Oliver Upton <oliver.upton@linux•dev>,
Sean Christopherson <seanjc@google•com>
Subject: linux-next: manual merge of the kvm-riscv tree with the kvm-arm tree
Date: Wed, 27 Mar 2024 11:29:07 +1100 [thread overview]
Message-ID: <20240327112907.33cd9bb1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1570 bytes --]
Hi all,
Today's linux-next merge of the kvm-riscv tree got a conflict in:
tools/testing/selftests/kvm/aarch64/arch_timer.c
between commit:
29b0075ed61c ("KVM: selftests: Fix __GUEST_ASSERT() format warnings in ARM's arch timer test")
from the kvm-arm tree and commit:
5448d9282af5 ("KVM: selftests: Fix spelling mistake "trigged" -> "triggered"")
from the kvm-riscv 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/aarch64/arch_timer.c
index 93100b3f1312,16ac74d07d68..000000000000
--- a/tools/testing/selftests/kvm/aarch64/arch_timer.c
+++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c
@@@ -135,8 -135,8 +135,8 @@@ static void guest_run_stage(struct test
irq_iter = READ_ONCE(shared_data->nr_iter);
__GUEST_ASSERT(config_iter + 1 == irq_iter,
- "config_iter + 1 = 0x%lx, irq_iter = 0x%lx.\n"
+ "config_iter + 1 = 0x%x, irq_iter = 0x%x.\n"
- " Guest timer interrupt was not trigged within the specified\n"
+ " Guest timer interrupt was not triggered within the specified\n"
" interval, try to increase the error margin by [-e] option.\n",
config_iter + 1, irq_iter);
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-03-27 0:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-27 0:29 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-21 6:48 linux-next: manual merge of the kvm-riscv tree with the kvm-arm tree 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=20240327112907.33cd9bb1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=anup@brainfault$(echo .)org \
--cc=cdall@cs$(echo .)columbia.edu \
--cc=colin.i.king@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maz@kernel$(echo .)org \
--cc=oliver.upton@linux$(echo .)dev \
--cc=seanjc@google$(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