linux-next: manual merge of the gpio tree with the arm-soc tree

linux-next: manual merge of the gpio tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 819 bytes --]

Hi all,

Today's linux-next merge of the gpio tree got a conflict in:

  arch/arm/mach-omap1/board-ams-delta.c

between commit:

  19a2668a8ae3 ("ARM: OMAP1: ams-delta: Provide GPIO lookup table for LED device")

from the arm-soc tree and commit:

  21abf103818a ("gpio: Pass a flag to gpiochip_request_own_desc()")

from the gpio tree.

I fixed it up (the former removed the code updated by the latter, so
I used that) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the gpio tree with the arm-soc tree

[Tony Lindgren]

* Stephen Rothwell <sfr@canb.auug.org.au> [181217 00:18]:
> Hi all,
> 
> Today's linux-next merge of the gpio tree got a conflict in:
> 
>   arch/arm/mach-omap1/board-ams-delta.c
> 
> between commit:
> 
>   19a2668a8ae3 ("ARM: OMAP1: ams-delta: Provide GPIO lookup table for LED device")
> 
> from the arm-soc tree and commit:
> 
>   21abf103818a ("gpio: Pass a flag to gpiochip_request_own_desc()")
> 
> from the gpio tree.
> 
> I fixed it up (the former removed the code updated by the latter, so
> I used that) 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.

OK thank you.

Regards,

Tony

Re: linux-next: manual merge of the gpio tree with the arm-soc tree

[Linus Walleij]

On Thu, Oct 6, 2016 at 12:41 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Tue, 27 Sep 2016 15:05:42 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the gpio tree got a conflict in:
>>
>>   arch/arm/mach-omap2/board-rx51-peripherals.c
>>
>> between commit:
>>
>>   9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900")
>>
>> from the arm-soc tree and commit:
>>
>>   9132ce450bd1 ("ARM: omap2: fix missing include")
>>
>> from the gpio tree.
>>
>> I fixed it up (the former removed the file, so I did that) 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.
>
> Since Linus (Torvalds) has merged the gpio tree, this conflict (and
> file removal) now affects the merge of the arm-soc tree).

Yup and I also informed him in my pull request about this conflict
so shouldn't be a problem.

Yours,
Linus Walleij

Re: linux-next: manual merge of the gpio tree with the arm-soc tree

[Stephen Rothwell]

Hi all,

On Tue, 27 Sep 2016 15:05:42 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the gpio tree got a conflict in:
> 
>   arch/arm/mach-omap2/board-rx51-peripherals.c
> 
> between commit:
> 
>   9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900")
> 
> from the arm-soc tree and commit:
> 
>   9132ce450bd1 ("ARM: omap2: fix missing include")
> 
> from the gpio tree.
> 
> I fixed it up (the former removed the file, so I did that) 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.

Since Linus (Torvalds) has merged the gpio tree, this conflict (and
file removal) now affects the merge of the arm-soc tree).

-- 
Cheers,
Stephen Rothwell

Re: linux-next: manual merge of the gpio tree with the arm-soc tree

[Tony Lindgren]

* Stephen Rothwell <sfr@canb.auug.org.au> [160926 22:06]:
> Hi Linus,
> 
> Today's linux-next merge of the gpio tree got a conflict in:
> 
>   arch/arm/mach-omap2/board-rx51-peripherals.c
> 
> between commit:
> 
>   9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900")
> 
> from the arm-soc tree and commit:
> 
>   9132ce450bd1 ("ARM: omap2: fix missing include")
> 
> from the gpio tree.
> 
> I fixed it up (the former removed the file, so I did that) 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.

Yes thanks removing it the way to go.

Regards,

Tony

linux-next: manual merge of the gpio tree with the arm-soc tree

[Stephen Rothwell]

Hi Linus,

Today's linux-next merge of the gpio tree got a conflict in:

  arch/arm/mach-omap2/board-rx51-peripherals.c

between commit:

  9b7141d01a76 ("ARM: OMAP2+: Drop legacy board file for n900")

from the arm-soc tree and commit:

  9132ce450bd1 ("ARM: omap2: fix missing include")

from the gpio tree.

I fixed it up (the former removed the file, so I did that) 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

Re: linux-next: manual merge of the gpio tree with the arm-soc tree

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 1190 bytes --]

On Tue, Jul 29, 2014 at 10:19:49AM +0200, Stephen Rothwell wrote:
> * PGP Signed by an unknown key
> 
> Hi Linus,
> 
> Today's linux-next merge of the gpio tree got a conflict in
> arch/arm/mach-tegra/board-paz00.c between commit a0524acc94c9 ("ARM:
> tegra: Sort includes alphabetically") from the arm-soc tree and commit
> 0a6d315827ee ("gpio: split gpiod board registration into machine
> header") from the gpio tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm/mach-tegra/board-paz00.c
> index bb4782a32713,91fd858ced0d..000000000000
> --- a/arch/arm/mach-tegra/board-paz00.c
> +++ b/arch/arm/mach-tegra/board-paz00.c
> @@@ -17,10 -17,9 +17,10 @@@
>    *
>    */
>   
> - #include <linux/gpio/driver.h>
>  -#include <linux/platform_device.h>
> + #include <linux/gpio/machine.h>
>  +#include <linux/platform_device.h>
>   #include <linux/rfkill-gpio.h>
>  +
>   #include "board.h"
>   
>   static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {

Looks good to me.

Thanks,
Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the gpio tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 980 bytes --]

Hi Linus,

Today's linux-next merge of the gpio tree got a conflict in
arch/arm/mach-tegra/board-paz00.c between commit a0524acc94c9 ("ARM:
tegra: Sort includes alphabetically") from the arm-soc tree and commit
0a6d315827ee ("gpio: split gpiod board registration into machine
header") from the gpio tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-tegra/board-paz00.c
index bb4782a32713,91fd858ced0d..000000000000
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@@ -17,10 -17,9 +17,10 @@@
   *
   */
  
- #include <linux/gpio/driver.h>
 -#include <linux/platform_device.h>
+ #include <linux/gpio/machine.h>
 +#include <linux/platform_device.h>
  #include <linux/rfkill-gpio.h>
 +
  #include "board.h"
  
  static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]