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

Arnd Bergmann arnd at arndb.de
Mon Jun 1 07:32:17 PDT 2015

On Monday 01 June 2015 10:56:35 Matthias Brugger wrote:
> 2015-06-01 10:11 GMT+02:00 Arnd Bergmann <arnd at 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.


More information about the linux-arm-kernel mailing list