Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.15-1 tag
From: Marc Zyngier
Date: Fri Sep 03 2021 - 10:30:34 EST
On Fri, 03 Sep 2021 14:36:57 +0100,
Michael Ellerman <mpe@xxxxxxxxxxxxxx> wrote:
> Hi Linus,
> Please pull powerpc updates for 5.15.
> A bit of a small batch this time.
> There was one conflict against my own fixes branch, and the resolution was a little bit
> messy, so I just did a merge of fixes myself to resolve the conflict. I didn't think there
> was any value in having you resolve a conflict between two of my own branches.
> Notable out of area changes:
> scripts/mod/modpost.c # 1e688dd2a3d6 powerpc/bug: Provide better flexibility to WARN_ON/__WARN_FLAGS() with asm goto
> kernel/irq/irqdomain.c # 51be9e51a800 KVM: PPC: Book3S HV: XIVE: Fix mapping of passthrough interrupts
> That second one generated a bit of discussion with tglx and maz,
> who asked if we could avoid adding the export of
> irq_get_default_host(). Cédric replied explaining that we don't
> really have good way to avoid it, but we never heard back from them,
> so in the end I decided to merge it.
Apologies for this, I clearly have lost track of it.
It clearly isn't pretty, but it isn't a deal breaker either. In the
end, it will be easier to address with the code being in the tree.
Without deviation from the norm, progress is not possible.