On Thu, Mar 20, 2025 at 2:37 PM Oliver Upton <oliver.upton@xxxxxxxxx> wrote: > > 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@xxxxxxxxx> 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@xxxxxxxxxxxxxxxx/ > > > > 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. Great, pulled now. Thanks! Paolo > Fixing that right now. > > Thanks, > Oliver >
