From: Oliver Upton <oliver.upton@linux.dev>
To: Marc Zyngier <maz@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
kvm@vger.kernel.org, kvmarm@lists.linux.dev,
Akihiko Odaki <akihiko.odaki@daynix.com>,
Will Deacon <will@kernel.org>,
Vincent Donnefort <vdonnefort@google.com>,
Sebastian Ott <sebott@redhat.com>,
Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>,
Fuad Tabba <tabba@google.com>
Subject: Re: [GIT PULL] KVM/arm64 updates for 6.15
Date: Thu, 20 Mar 2025 06:36:48 -0700 [thread overview]
Message-ID: <Z9wZ8EuChPyJ6PiK@linux.dev> (raw)
In-Reply-To: <86ecyrn9hf.wl-maz@kernel.org>
Hey,
On Thu, Mar 20, 2025 at 12:59:40PM +0000, Marc Zyngier wrote:
> Paolo,
>
> On Thu, 20 Mar 2025 04:29:25 +0000,
> Oliver Upton <oliver.upton@linux.dev> wrote:
> >
> > Hi Paolo,
> >
> > Here's the latest pile o' patches for 6.15. The pull is based on a later
> > -rc than I usually aim for to handle some conflicts with fixes that went
> > in 6.14, but all of these patches have had exposure in -next for a good
> > while.
> >
> > There was a small conflict with the arm perf tree, which was addressed
> > by Will pulling a prefix of the M1 PMU branch:
> >
> > https://lore.kernel.org/linux-next/20250312201853.0d75d9fe@canb.auug.org.au/
>
> When you merge this, please also apply the patch below to address a
> mismerge issue caught by Stephen, which causes a build breakage.
The kvmarm-6.15 tag is fine, I caught this immediately when I was doing
testing for the pull request but forgot to push the fix to /next in
addition to the tag.
Fixing that right now.
Thanks,
Oliver
next prev parent reply other threads:[~2025-03-20 13:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-20 4:29 [GIT PULL] KVM/arm64 updates for 6.15 Oliver Upton
2025-03-20 12:59 ` Marc Zyngier
2025-03-20 13:36 ` Oliver Upton [this message]
2025-03-20 17:23 ` Paolo Bonzini
2025-03-20 17:38 ` Oliver Upton
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=Z9wZ8EuChPyJ6PiK@linux.dev \
--to=oliver.upton@linux.dev \
--cc=akihiko.odaki@daynix.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=maz@kernel.org \
--cc=pbonzini@redhat.com \
--cc=sebott@redhat.com \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=tabba@google.com \
--cc=vdonnefort@google.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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