[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[Matthias Brugger]

Hi all,

Please take the following changes into account.

Thanks,
Matthias

---

The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754:

  Linux 4.2-rc1 (2015-07-05 11:01:52 -0700)

are available in the git repository at:

  https://github.com/mbgg/linux-mediatek.git tags/v4.2-next-arm64

for you to fetch changes up to e26945245e414eff42ee1ffeaedf198911bf1d77:

  arm64: dts: mediatek: add mt6795 support (2015-07-23 19:55:55 +0200)

----------------------------------------------------------------
- arm64: dts: mediatek: add mt6795 support
- Document: DT: Add bindings for mediatek MT6795 SoC Platform
- arm64: dts: mediatek: Add MT8173 MMC dts
- arm64: dts: mt8173: Add afe device node
- arm64: dts: mt8173-evb: Add PMIC support
- dts: mt8173-evb: Add da9211 to i2c1
- ARM: dts: mt8173: support arm64 cpuidle-dt
- ARM64: MediaTek MT8173: Add SCPSYS device node
- arm64: dts: mt8173: Add I2C device node
- arm64: dts: mt8173: Add watchdog device node
- arm64: dts: mt8173: Add PMIC wrapper device node
- arm64: dts: mt8173: Use real clock for UARTs
- arm64: dts: mt8173: Add clock controller device nodes

----------------------------------------------------------------
Eddie Huang (4):
      arm64: dts: mt8173: Add watchdog device node
      arm64: dts: mt8173: Add I2C device node
      arm64: dts: mt8173-evb: Add PMIC support
      arm64: dts: mediatek: Add MT8173 MMC dts

Henry Chen (1):
      dts: mt8173-evb: Add da9211 to i2c1

Howard Chen (1):
      ARM: dts: mt8173: support arm64 cpuidle-dt

Koro Chen (1):
      arm64: dts: mt8173: Add afe device node

Mars Cheng (2):
      Document: DT: Add bindings for mediatek MT6795 SoC Platform
      arm64: dts: mediatek: add mt6795 support

Sascha Hauer (4):
      arm64: dts: mt8173: Add clock controller device nodes
      arm64: dts: mt8173: Use real clock for UARTs
      arm64: dts: mt8173: Add PMIC wrapper device node
      ARM64: MediaTek MT8173: Add SCPSYS device node

 Documentation/devicetree/bindings/arm/mediatek.txt |   9 +-
 .../bindings/arm/mediatek/mediatek,sysirq.txt      |   3 +-
 .../devicetree/bindings/serial/mtk-uart.txt        |   5 +-
 arch/arm64/boot/dts/mediatek/Makefile              |   1 +
 arch/arm64/boot/dts/mediatek/mt6795-evb.dts        |  41 +++
 arch/arm64/boot/dts/mediatek/mt6795.dtsi           | 162 ++++++++++
 arch/arm64/boot/dts/mediatek/mt8173-evb.dts        | 353 +++++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt8173.dtsi           | 327 ++++++++++++++++++-
 8 files changed, 883 insertions(+), 18 deletions(-)
 create mode 100644 arch/arm64/boot/dts/mediatek/mt6795-evb.dts
 create mode 100644 arch/arm64/boot/dts/mediatek/mt6795.dtsi

[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[Olof Johansson]

Hi Matthias,

On Tue, Jul 28, 2015 at 02:06:30PM +0200, Matthias Brugger wrote:
> Hi all,
> 
> Please take the following changes into account.
> 
> Thanks,
> Matthias
> 
> ---
> 
> The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754:
> 
>   Linux 4.2-rc1 (2015-07-05 11:01:52 -0700)
> 
> are available in the git repository at:
> 
>   https://github.com/mbgg/linux-mediatek.git tags/v4.2-next-arm64
> 
> for you to fetch changes up to e26945245e414eff42ee1ffeaedf198911bf1d77:
> 
>   arm64: dts: mediatek: add mt6795 support (2015-07-23 19:55:55 +0200)
> 
> ----------------------------------------------------------------
> - arm64: dts: mediatek: add mt6795 support
> - Document: DT: Add bindings for mediatek MT6795 SoC Platform
> - arm64: dts: mediatek: Add MT8173 MMC dts
> - arm64: dts: mt8173: Add afe device node
> - arm64: dts: mt8173-evb: Add PMIC support
> - dts: mt8173-evb: Add da9211 to i2c1
> - ARM: dts: mt8173: support arm64 cpuidle-dt
> - ARM64: MediaTek MT8173: Add SCPSYS device node
> - arm64: dts: mt8173: Add I2C device node
> - arm64: dts: mt8173: Add watchdog device node
> - arm64: dts: mt8173: Add PMIC wrapper device node
> - arm64: dts: mt8173: Use real clock for UARTs
> - arm64: dts: mt8173: Add clock controller device nodes
> 

Merged, but please write a descriptive tag message in the future instead of
just listing the patches. A brief overview of what's in the branch is a lot
more useful, since the list of patches makes it into the merge commit anyway.


Thanks,


-Olof

[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[Matthias Brugger]

On Tuesday, July 28, 2015 06:15:46 PM Olof Johansson wrote:
> Hi Matthias,
> 
> On Tue, Jul 28, 2015 at 02:06:30PM +0200, Matthias Brugger wrote:
> > Hi all,
> > 
> > Please take the following changes into account.
> > 
> > Thanks,
> > Matthias
> > 
> > ---
> > 
> > The following changes since commit 
d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754:
> >   Linux 4.2-rc1 (2015-07-05 11:01:52 -0700)
> > 
> > are available in the git repository at:
> >   https://github.com/mbgg/linux-mediatek.git tags/v4.2-next-arm64
> > 
> > for you to fetch changes up to e26945245e414eff42ee1ffeaedf198911bf1d77:
> >   arm64: dts: mediatek: add mt6795 support (2015-07-23 19:55:55 +0200)
> > 
> > ----------------------------------------------------------------
> > - arm64: dts: mediatek: add mt6795 support
> > - Document: DT: Add bindings for mediatek MT6795 SoC Platform
> > - arm64: dts: mediatek: Add MT8173 MMC dts
> > - arm64: dts: mt8173: Add afe device node
> > - arm64: dts: mt8173-evb: Add PMIC support
> > - dts: mt8173-evb: Add da9211 to i2c1
> > - ARM: dts: mt8173: support arm64 cpuidle-dt
> > - ARM64: MediaTek MT8173: Add SCPSYS device node
> > - arm64: dts: mt8173: Add I2C device node
> > - arm64: dts: mt8173: Add watchdog device node
> > - arm64: dts: mt8173: Add PMIC wrapper device node
> > - arm64: dts: mt8173: Use real clock for UARTs
> > - arm64: dts: mt8173: Add clock controller device nodes
> 
> Merged, but please write a descriptive tag message in the future instead of
> just listing the patches. A brief overview of what's in the branch is a lot
> more useful, since the list of patches makes it into the merge commit
> anyway.
> 

Ok, I will do next time.

Thanks.
Matthias

[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[Matthias Brugger]

Hi Arnd and Olof,

Please pull the following updates for v4.2.

Thanks,
Matthias

---

The following changes since commit b787f68c36d49bb1d9236f403813641efa74a031:

  Linux 4.1-rc1 (2015-04-26 17:59:10 -0700)

are available in the git repository at:

  https://github.com/mbgg/linux-mediatek.git tags/v4.1-next-arm64

for you to fetch changes up to e881ad1bc6e46fc933fef77cfe587625e30478e9:

  arm64: dts: mt8173: fix some indentation (2015-06-01 10:06:12 +0200)

----------------------------------------------------------------
- dts: mt8173: fix style convention for pinctrl node
- dts: mt8173: fix indentation for some nodes

----------------------------------------------------------------
Daniel Kurtz (1):
      arm64: dts: mt8173: fix some indentation

Yingjoe Chen (1):
      arm64: dts: mt8173: Fixup pinctrl nodes

 arch/arm64/boot/dts/mediatek/mt8173.dtsi | 41 +++++++++++++++++---------------
 1 file changed, 22 insertions(+), 19 deletions(-)

[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[Arnd Bergmann]

On Monday 01 June 2015 12:30:24 Matthias Brugger wrote:
> - dts: mt8173: fix style convention for pinctrl node
> - dts: mt8173: fix indentation for some nodes
> 

Merged into next/dt, thanks!

	Arnd

[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[Matthias Brugger]

Hi Arnd and Olof,

Please take the following changes into account.

Thanks,
Matthias

---

The following changes since commit b787f68c36d49bb1d9236f403813641efa74a031:

  Linux 4.1-rc1 (2015-04-26 17:59:10 -0700)

are available in the git repository at:

  https://github.com/mbgg/linux-mediatek.git tags/v4.1-next-arm64

for you to fetch changes up to d211193d4ddeab0327f4b571ec34f641ae59eb89:

  arm64: dts: mt8173: Add PMIC wrapper device node (2015-05-27 13:41:18 +0200)

----------------------------------------------------------------
- dts: fixup pinctrl mt8173
- dts: mt8173-evb fix model name
- dts: mt8173 fix identation
- dts: mt8173 add clock controller
- dts: mt8173 change uart clocks
- dts: mt8173 add pmic wrapper

----------------------------------------------------------------
Daniel Kurtz (1):
      arm64: dts: mt8173: fix some indentation

Sascha Hauer (3):
      arm64: dts: mt8173: Add clock controller device nodes
      arm64: dts: mt8173: Use real clock for UARTs
      arm64: dts: mt8173: Add PMIC wrapper device node

Yingjoe Chen (2):
      arm64: dts: mt8173: Fixup pinctrl nodes
      arm64: dts: mt8173-evb: fix model name

 arch/arm64/boot/dts/mediatek/mt8173-evb.dts |  3 +-
 arch/arm64/boot/dts/mediatek/mt8173.dtsi    | 98 ++++++++++++++++++++++-------
 2 files changed, 78 insertions(+), 23 deletions(-)

[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[Arnd Bergmann]

On Wednesday 27 May 2015 17:14:08 Matthias Brugger wrote:
> - dts: fixup pinctrl mt8173
> - dts: mt8173-evb fix model name
> - dts: mt8173 fix identation
> - dts: mt8173 add clock controller
> - dts: mt8173 change uart clocks
> - dts: mt8173 add pmic wrapper
> 

Pulled into next/dt, thanks!

	Arnd

[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[Arnd Bergmann]

On Friday 29 May 2015 14:04:32 Arnd Bergmann wrote:
> On Wednesday 27 May 2015 17:14:08 Matthias Brugger wrote:
> > - dts: fixup pinctrl mt8173
> > - dts: mt8173-evb fix model name
> > - dts: mt8173 fix identation
> > - dts: mt8173 add clock controller
> > - dts: mt8173 change uart clocks
> > - dts: mt8173 add pmic wrapper
> > 
> 
> Pulled into next/dt, thanks!
> 

Dropped it again, after getting a build error:

  DTC     arch/arm64/boot/dts/mediatek/mt8173-evb.dtb
In file included from ../arch/arm64/boot/dts/mediatek/mt8173-evb.dts:16:0:
../arch/arm64/boot/dts/mediatek/mt8173.dtsi:14:42: fatal error: dt-bindings/clock/mt8173-clk.h: No such file or directory
 #include <dt-bindings/clock/mt8173-clk.h>
                                          ^

Please fix and resubmit.

	Arnd

[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[Sascha Hauer]

On Fri, May 29, 2015 at 02:07:40PM +0200, Arnd Bergmann wrote:
> On Friday 29 May 2015 14:04:32 Arnd Bergmann wrote:
> > On Wednesday 27 May 2015 17:14:08 Matthias Brugger wrote:
> > > - dts: fixup pinctrl mt8173
> > > - dts: mt8173-evb fix model name
> > > - dts: mt8173 fix identation
> > > - dts: mt8173 add clock controller
> > > - dts: mt8173 change uart clocks
> > > - dts: mt8173 add pmic wrapper
> > > 
> > 
> > Pulled into next/dt, thanks!
> > 
> 
> Dropped it again, after getting a build error:
> 
>   DTC     arch/arm64/boot/dts/mediatek/mt8173-evb.dtb
> In file included from ../arch/arm64/boot/dts/mediatek/mt8173-evb.dts:16:0:
> ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:14:42: fatal error: dt-bindings/clock/mt8173-clk.h: No such file or directory
>  #include <dt-bindings/clock/mt8173-clk.h>
>                                           ^
> 
> Please fix and resubmit.

These come from the clk tree. My original suggestion was to pull in this
dts changes late after -rc1. Other possibility: Stephen, can you provide
a stable commit containing the Mediatek clk changes?

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[Arnd Bergmann]

On Friday 29 May 2015 14:58:29 Sascha Hauer wrote:
> On Fri, May 29, 2015 at 02:07:40PM +0200, Arnd Bergmann wrote:
> > On Friday 29 May 2015 14:04:32 Arnd Bergmann wrote:
> > > On Wednesday 27 May 2015 17:14:08 Matthias Brugger wrote:
> > > > - dts: fixup pinctrl mt8173
> > > > - dts: mt8173-evb fix model name
> > > > - dts: mt8173 fix identation
> > > > - dts: mt8173 add clock controller
> > > > - dts: mt8173 change uart clocks
> > > > - dts: mt8173 add pmic wrapper
> > > > 
> > > 
> > > Pulled into next/dt, thanks!
> > > 
> > 
> > Dropped it again, after getting a build error:
> > 
> >   DTC     arch/arm64/boot/dts/mediatek/mt8173-evb.dtb
> > In file included from ../arch/arm64/boot/dts/mediatek/mt8173-evb.dts:16:0:
> > ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:14:42: fatal error: dt-bindings/clock/mt8173-clk.h: No such file or directory
> >  #include <dt-bindings/clock/mt8173-clk.h>
> >                                           ^
> > 
> > Please fix and resubmit.
> 
> These come from the clk tree. My original suggestion was to pull in this
> dts changes late after -rc1.

Please don't do it that way. If you can't figure out a way to
avoid the dependency, just stage it out over an extra merge window
and add the driver first and the dt changes the next time.

> Other possibility: Stephen, can you provide
> a stable commit containing the Mediatek clk changes?

That would work.

	Arnd

[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[Stephen Boyd]

On 05/29, Arnd Bergmann wrote:
> On Friday 29 May 2015 14:58:29 Sascha Hauer wrote:
> > On Fri, May 29, 2015 at 02:07:40PM +0200, Arnd Bergmann wrote:
> > > On Friday 29 May 2015 14:04:32 Arnd Bergmann wrote:
> > > > On Wednesday 27 May 2015 17:14:08 Matthias Brugger wrote:
> > > > > - dts: fixup pinctrl mt8173
> > > > > - dts: mt8173-evb fix model name
> > > > > - dts: mt8173 fix identation
> > > > > - dts: mt8173 add clock controller
> > > > > - dts: mt8173 change uart clocks
> > > > > - dts: mt8173 add pmic wrapper
> > > > > 
> > > > 
> > > > Pulled into next/dt, thanks!
> > > > 
> > > 
> > > Dropped it again, after getting a build error:
> > > 
> > >   DTC     arch/arm64/boot/dts/mediatek/mt8173-evb.dtb
> > > In file included from ../arch/arm64/boot/dts/mediatek/mt8173-evb.dts:16:0:
> > > ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:14:42: fatal error: dt-bindings/clock/mt8173-clk.h: No such file or directory
> > >  #include <dt-bindings/clock/mt8173-clk.h>
> > >                                           ^
> > > 
> > > Please fix and resubmit.
> > 
> > These come from the clk tree. My original suggestion was to pull in this
> > dts changes late after -rc1.
> 
> Please don't do it that way. If you can't figure out a way to
> avoid the dependency, just stage it out over an extra merge window
> and add the driver first and the dt changes the next time.
> 
> > Other possibility: Stephen, can you provide
> > a stable commit containing the Mediatek clk changes?
> 
> That would work.

Or another possibility, put the same header file into the branch
you send to arm-soc. Git will figure out that the files are
exactly the same and there's no cross tree dependency.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[Matthias Brugger]

2015-05-29 18:46 GMT+02:00 Stephen Boyd <sboyd@codeaurora.org>:
> On 05/29, Arnd Bergmann wrote:
>> On Friday 29 May 2015 14:58:29 Sascha Hauer wrote:
>> > On Fri, May 29, 2015 at 02:07:40PM +0200, Arnd Bergmann wrote:
>> > > On Friday 29 May 2015 14:04:32 Arnd Bergmann wrote:
>> > > > On Wednesday 27 May 2015 17:14:08 Matthias Brugger wrote:
>> > > > > - dts: fixup pinctrl mt8173
>> > > > > - dts: mt8173-evb fix model name
>> > > > > - dts: mt8173 fix identation
>> > > > > - dts: mt8173 add clock controller
>> > > > > - dts: mt8173 change uart clocks
>> > > > > - dts: mt8173 add pmic wrapper
>> > > > >
>> > > >
>> > > > Pulled into next/dt, thanks!
>> > > >
>> > >
>> > > Dropped it again, after getting a build error:
>> > >
>> > >   DTC     arch/arm64/boot/dts/mediatek/mt8173-evb.dtb
>> > > In file included from ../arch/arm64/boot/dts/mediatek/mt8173-evb.dts:16:0:
>> > > ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:14:42: fatal error: dt-bindings/clock/mt8173-clk.h: No such file or directory
>> > >  #include <dt-bindings/clock/mt8173-clk.h>
>> > >                                           ^
>> > >
>> > > Please fix and resubmit.
>> >
>> > These come from the clk tree. My original suggestion was to pull in this
>> > dts changes late after -rc1.
>>
>> Please don't do it that way. If you can't figure out a way to
>> avoid the dependency, just stage it out over an extra merge window
>> and add the driver first and the dt changes the next time.
>>
>> > Other possibility: Stephen, can you provide
>> > a stable commit containing the Mediatek clk changes?
>>
>> That would work.
>
> Or another possibility, put the same header file into the branch
> you send to arm-soc. Git will figure out that the files are
> exactly the same and there's no cross tree dependency.

OK, I will do that.

-- 
motzblog.wordpress.com

[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[Arnd Bergmann]

On Monday 01 June 2015 10:07:40 Matthias Brugger wrote:
> 2015-05-29 18:46 GMT+02:00 Stephen Boyd <sboyd@codeaurora.org>:
> > On 05/29, Arnd Bergmann wrote:
> >> On Friday 29 May 2015 14:58:29 Sascha Hauer wrote:
> >> > On Fri, May 29, 2015 at 02:07:40PM +0200, Arnd Bergmann wrote:
> >> > > On Friday 29 May 2015 14:04:32 Arnd Bergmann wrote:
> >> > > > On Wednesday 27 May 2015 17:14:08 Matthias Brugger wrote:
> >> > > > > - dts: fixup pinctrl mt8173
> >> > > > > - dts: mt8173-evb fix model name
> >> > > > > - dts: mt8173 fix identation
> >> > > > > - dts: mt8173 add clock controller
> >> > > > > - dts: mt8173 change uart clocks
> >> > > > > - dts: mt8173 add pmic wrapper
> >> > > > >
> >> > > >
> >> > > > Pulled into next/dt, thanks!
> >> > > >
> >> > >
> >> > > Dropped it again, after getting a build error:
> >> > >
> >> > >   DTC     arch/arm64/boot/dts/mediatek/mt8173-evb.dtb
> >> > > In file included from ../arch/arm64/boot/dts/mediatek/mt8173-evb.dts:16:0:
> >> > > ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:14:42: fatal error: dt-bindings/clock/mt8173-clk.h: No such file or directory
> >> > >  #include <dt-bindings/clock/mt8173-clk.h>
> >> > >                                           ^
> >> > >
> >> > > Please fix and resubmit.
> >> >
> >> > These come from the clk tree. My original suggestion was to pull in this
> >> > dts changes late after -rc1.
> >>
> >> Please don't do it that way. If you can't figure out a way to
> >> avoid the dependency, just stage it out over an extra merge window
> >> and add the driver first and the dt changes the next time.
> >>
> >> > Other possibility: Stephen, can you provide
> >> > a stable commit containing the Mediatek clk changes?
> >>
> >> That would work.
> >
> > Or another possibility, put the same header file into the branch
> > you send to arm-soc. Git will figure out that the files are
> > exactly the same and there's no cross tree dependency.
> 
> OK, I will do that.
> 

If you put the same file in two branches, please use the same commit
ID. While git can figure it out when everything goes right, it will
fail horribly if one of the branches later gets a patch on top that
modifies the file, before the two branches get merged.


	Arnd

[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[Matthias Brugger]

2015-06-01 10:11 GMT+02:00 Arnd Bergmann <arnd@arndb.de>:
> On Monday 01 June 2015 10:07:40 Matthias Brugger wrote:
>> 2015-05-29 18:46 GMT+02:00 Stephen Boyd <sboyd@codeaurora.org>:
>> > On 05/29, Arnd Bergmann wrote:
>> >> On Friday 29 May 2015 14:58:29 Sascha Hauer wrote:
>> >> > On Fri, May 29, 2015 at 02:07:40PM +0200, Arnd Bergmann wrote:
>> >> > > On Friday 29 May 2015 14:04:32 Arnd Bergmann wrote:
>> >> > > > On Wednesday 27 May 2015 17:14:08 Matthias Brugger wrote:
>> >> > > > > - dts: fixup pinctrl mt8173
>> >> > > > > - dts: mt8173-evb fix model name
>> >> > > > > - dts: mt8173 fix identation
>> >> > > > > - dts: mt8173 add clock controller
>> >> > > > > - dts: mt8173 change uart clocks
>> >> > > > > - dts: mt8173 add pmic wrapper
>> >> > > > >
>> >> > > >
>> >> > > > Pulled into next/dt, thanks!
>> >> > > >
>> >> > >
>> >> > > Dropped it again, after getting a build error:
>> >> > >
>> >> > >   DTC     arch/arm64/boot/dts/mediatek/mt8173-evb.dtb
>> >> > > In file included from ../arch/arm64/boot/dts/mediatek/mt8173-evb.dts:16:0:
>> >> > > ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:14:42: fatal error: dt-bindings/clock/mt8173-clk.h: No such file or directory
>> >> > >  #include <dt-bindings/clock/mt8173-clk.h>
>> >> > >                                           ^
>> >> > >
>> >> > > Please fix and resubmit.
>> >> >
>> >> > These come from the clk tree. My original suggestion was to pull in this
>> >> > dts changes late after -rc1.
>> >>
>> >> Please don't do it that way. If you can't figure out a way to
>> >> avoid the dependency, just stage it out over an extra merge window
>> >> and add the driver first and the dt changes the next time.
>> >>
>> >> > Other possibility: Stephen, can you provide
>> >> > a stable commit containing the Mediatek clk changes?
>> >>
>> >> That would work.
>> >
>> > Or another possibility, put the same header file into the branch
>> > you send to arm-soc. Git will figure out that the files are
>> > exactly the same and there's no cross tree dependency.
>>
>> OK, I will do that.
>>
>
> If you put the same file in two branches, please use the same commit
> ID. While git can figure it out when everything goes right, it will
> fail horribly if one of the branches later gets a patch on top that
> modifies the file, before the two branches get merged.

I just saw, that the commit in question has dependencies to other commits.
So I decided I will drop the patches which cause problems. They should
go into the next merge window.

Regards,
Matthias

-- 
motzblog.wordpress.com

[GIT PULL] ARM: mediatek: arm64 updates for v4.2

[Arnd Bergmann]

On Monday 01 June 2015 10:56:35 Matthias Brugger wrote:
> 2015-06-01 10:11 GMT+02:00 Arnd Bergmann <arnd@arndb.de>:
> >
> > If you put the same file in two branches, please use the same commit
> > ID. While git can figure it out when everything goes right, it will
> > fail horribly if one of the branches later gets a patch on top that
> > modifies the file, before the two branches get merged.
> 
> I just saw, that the commit in question has dependencies to other commits.
> So I decided I will drop the patches which cause problems. They should
> go into the next merge window.
> 

Ok, thanks. That will make it simpler for me.

	Arnd