From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mark Brown <broonie@kernel•org>, "Rafael J. Wysocki" <rjw@rjwysocki•net>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Lukas Wunner <lukas@wunner•de>,
Suniel Mahesh <sunil.m@techveda•org>,
Karthik Tummala <karthik@techveda•org>
Subject: Re: linux-next: manual merge of the spi tree with the pm tree
Date: Mon, 4 Sep 2017 14:56:06 +1000 [thread overview]
Message-ID: <20170904145606.218d9d7a@canb.auug.org.au> (raw)
In-Reply-To: <20170817132308.090d4b88@canb.auug.org.au>
Hi all,
On Thu, 17 Aug 2017 13:23:08 +1000 Stephen Rothwell <sfr@canb•auug.org.au> 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
next prev parent reply other threads:[~2017-09-04 4:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-17 3:23 linux-next: manual merge of the spi tree with the pm tree Stephen Rothwell
2017-09-04 4:56 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-05-01 2:50 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170904145606.218d9d7a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@kernel$(echo .)org \
--cc=karthik@techveda$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lukas@wunner$(echo .)de \
--cc=rjw@rjwysocki$(echo .)net \
--cc=sunil.m@techveda$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox