On 16/06/2016 07:20, David Miller wrote: > From: John Crispin <j...@phrozen.org> > Date: Wed, 15 Jun 2016 16:58:46 +0200 > >> This series contains 2 small code cleanups that are leftovers from the >> MIPS support. There is also a small fix that adds proper locking to the >> code accessing the IRQ registers. Without this fix we saw deadlocks caused >> by the last patch of the series, which adds IRQ grouping. The grouping >> feature allows us to use different IRQs for TX and RX. By doing so we can >> use affinity to let the SoC handle the IRQs on different cores. > > This patch series doesn't apply cleanly to the net-next tree, I get rejects > on patch #4. >
it depends on the series with the 11 fixes that i sent last week which is however in the net tree and not the next tree (i also still had the DQL hack in my tree). if i resend this at the start of the next rc1 would you merge it into the net tree so that it becomes part of v4.8 ? John