Hi all,
On Thu, 17 Aug 2017 13:23:08 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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 commit:
>
> 9b61e302210e ("spi: Pick spi bus number from Linux idr or spi alias")
>
> from the spi tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/spi/spi.c
> index 7d920ea19957,43cb8b98e953..000000000000
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@@ -40,7 -40,7 +40,8 @@@
> #include <linux/ioport.h>
> #include <linux/acpi.h>
> #include <linux/highmem.h>
> +#include <linux/platform_data/x86/apple.h>
> + #include <linux/idr.h>
>
> #define CREATE_TRACE_POINTS
> #include <trace/events/spi.h>
Just a reminder that this conflict still exists.
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
