From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] ARM: mediatek: arm64 updates for v4.2
Date: Mon, 01 Jun 2015 16:32:17 +0200 [thread overview]
Message-ID: <1461817.ARd56COj2q@wuerfel> (raw)
In-Reply-To: <CABuKBeK+LT4UDKe0P=vswEXTUevcSNTf2Gn0cdMQ7r=tj2JmOA@mail.gmail.com>
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
next prev parent reply other threads:[~2015-06-01 14:32 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-27 15:14 [GIT PULL] ARM: mediatek: arm64 updates for v4.2 Matthias Brugger
2015-05-29 12:04 ` Arnd Bergmann
2015-05-29 12:07 ` Arnd Bergmann
2015-05-29 12:58 ` Sascha Hauer
2015-05-29 14:28 ` Arnd Bergmann
2015-05-29 16:46 ` Stephen Boyd
2015-06-01 8:07 ` Matthias Brugger
2015-06-01 8:11 ` Arnd Bergmann
2015-06-01 8:56 ` Matthias Brugger
2015-06-01 14:32 ` Arnd Bergmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-06-01 10:30 Matthias Brugger
2015-06-01 16:00 ` Arnd Bergmann
2015-07-28 12:06 Matthias Brugger
2015-07-28 16:15 ` Olof Johansson
2015-07-29 8:21 ` Matthias Brugger
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=1461817.ARd56COj2q@wuerfel \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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