From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: [GIT PULL] ARM: mediatek: arm64 updates for v4.2 Date: Mon, 01 Jun 2015 16:32:17 +0200 Message-ID: <1461817.ARd56COj2q@wuerfel> References: <2507882.daayE1Zgb4@wuerfel> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+glpam-linux-mediatek=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org To: Matthias Brugger Cc: Sascha Hauer , Stephen Boyd , arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, "moderated list:ARM/Mediatek SoC..." , Yingjoe Chen , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" List-Id: linux-mediatek@lists.infradead.org On Monday 01 June 2015 10:56:35 Matthias Brugger wrote: > 2015-06-01 10:11 GMT+02:00 Arnd Bergmann : > > > > 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