Re: linux-next: manual merge of the spi tree with the pm tree

Hi all, On Thu, 17 Aug 2017 13:23:08 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the spi tree got a conflict in: > > drivers/spi/spi.c > > between commit: > > 8a2e487e6fc1 ("spi: Use Apple device properties in absence of ACPI > resources") > > from the pm tree and comm

linux-next: manual merge of the spi tree with the pm tree

Hi Mark, Today's linux-next merge of the spi tree got a conflict in: drivers/spi/spi.c between commit: 8a2e487e6fc1 ("spi: Use Apple device properties in absence of ACPI resources") from the pm tree and commit: 9b61e302210e ("spi: Pick spi bus number from Linux idr or spi alias") from

linux-next: manual merge of the spi tree with the pm tree

Hi Mark, Today's linux-next merge of the spi tree got a conflict in: drivers/acpi/acpi_apd.c between commit: 6e14cf361a0c ("ACPI / APD: Add clock frequency for Hisilicon Hip07/08 I2C controller") from the pm tree and commit: 251831bd4f49 ("spi: xlp: update for ARCH_VULCAN2") from the