Hi Mark, On Tue, Jun 26, 2018 at 03:59:59PM +0100, Mark Brown wrote: > The patch > > spi: ath79: drop pdata support > > has been applied to the spi tree at > > https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git This is going to be problematic if it goes in before the corresponding conversion of the MIPS platform code to use device tree, which is currently being reviewed. To quote John's patch email: > Hi Mark, > Once Acked, this patch should ideally go upstream via the mips tree to > avoid merge order conflicts with the series converting the target to > OF. > John Could you possibly drop this from your tree & ack it to go through the MIPS tree along with the relevant platform/board changes? Thanks, Paul