On Wed, 1 Nov 2017, Paul Burton wrote:
> Hi Marc,
>
> On Wed, Nov 01, 2017 at 12:13:16AM +0000, Marc Zyngier wrote:
> > On Tue, Oct 31 2017 at 9:41:43 am GMT, Paul Burton <[email protected]>
> > wrote:
> > > This series continues cleaning & fixing up the MIPS GIC irqchip driver
> > > whilst laying groundwork to support multi-cluster systems.
>
> <SNIP>
>
> > Are those targeting 4.14 or 4.15? It is getting quite late for the
> > former, and it doesn't seem to cleanly apply on tip/irq/core (or my
> > irqchip-4.15 branch) if that's for the latter (patch 6 shouts at me).
>
> Whichever you're happiest with. If you'd like me to rebase them & resubmit
> that's fine.
>
> I see the conflict with patch 6 atop tip/irq/core - it's because tip/irq/core
> is based upon v4.14-rc2 which doesn't have commit a08588ea486a
> ("irqchip/mips-gic: Fix shifts to extract register fields") that went into
> v4.14-rc3. The correct resolution is to keep the patches version of things
> (ie.
> delete the block of code).
Marc, simply merge current linus into your branch with the reason:
Pick up upstream fixes so dependent patches apply
Thanks,
tglx
