On Sun, Feb 05, 2017 at 10:17:29AM +1100, Stephen Rothwell wrote: > OK, it is possible that the merge is actually incorrect. I did *not* > do any manual resolution of that merge and git only reported an > automatic resolution in file drivers/spi/spi-bcm-qspi.c (which looks ok > from a quick glance).
That's a driver for Broadcom SoCs which is not going to run on x86 so...
signature.asc
Description: PGP signature
