From: arnd@arndb•de (Arnd Bergmann)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL] DEBUG_LL platform updates for 3.2
Date: Mon, 10 Oct 2011 13:20:24 +0200 [thread overview]
Message-ID: <201110101320.24457.arnd@arndb.de> (raw)
In-Reply-To: <20111010103635.GA2451@mudshark.cambridge.arm.com>
On Monday 10 October 2011, Will Deacon wrote:
> > I can certainly fix up the conflicts, but my feeling is that there is
> > something wrong on your side and one of the two branches contains
> > stuff from a stale version of Russell's tree.
>
> It looks like both of the branches [cpu-mapping and debug-ll] may be out of
> date now. I agree that fixing up the conflicts isn't the way to go here, but
> I'm unsure what to use as my base. I depend on patches that aren't in
> Russell's devel-stable branch but are in his for-next branch.
>
> The only things I can think of are either:
>
> - Wait until everything has settled down, then rebase onto Russell's
> for-linus branch. This has the disadvantage that conflicts and build
> breakages won't be detected until very late.
>
> - Wait until the dependencies are in mainline, then rebase against that.
> Disadvantage is that it then takes twice as long to get code upstream.
>
> - Send another pull request against an unstable branch and hope it doesn't
> change. Disadvantage being that we have to keep repeating pull requests
> against a moving target.
>
> I'm not especially fond of any of those though...
>
> Do you have any other ideas?
I think the best solution would be to ask Russell to put all the dependencies
into a non-rebasing branch and publish that, or to alternatively merge your
patches through his tree instead, with my Ack.
Both of these will also have to wait for a few more days until Russell
is back online.
Can you check if the devel-stable branch in his tree already contains the
dependencies?
Arnd
next prev parent reply other threads:[~2011-10-10 11:20 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-28 10:38 [GIT PULL] DEBUG_LL platform updates for 3.2 Will Deacon
2011-10-03 8:35 ` Will Deacon
2011-10-07 20:51 ` Arnd Bergmann
2011-10-10 10:36 ` Will Deacon
2011-10-10 11:20 ` Arnd Bergmann [this message]
2011-10-10 13:32 ` Will Deacon
2011-10-11 7:52 ` Shawn Guo
2011-10-11 13:33 ` Arnd Bergmann
2011-10-11 15:09 ` Will Deacon
2011-10-11 18:48 ` Will Deacon
2011-10-11 19:25 ` Arnd Bergmann
2011-10-12 0:03 ` Nicolas Pitre
2011-10-12 8:30 ` Arnd Bergmann
2011-10-13 8:28 ` Russell King - ARM Linux
2011-10-13 13:39 ` Nicolas Pitre
2011-10-13 14:05 ` Russell King - ARM Linux
2011-10-13 18:36 ` Nicolas Pitre
2011-10-13 14:50 ` Arnd Bergmann
2011-10-13 23:09 ` Ryan Mallon
2011-10-13 23:40 ` Ryan Mallon
2011-10-14 2:32 ` Nicolas Pitre
2011-10-12 8:38 ` Jamie Iles
2011-10-12 20:16 ` Nicolas Pitre
2011-10-13 8:23 ` Russell King - ARM Linux
2011-10-13 18:46 ` Nicolas Pitre
2011-10-12 17:29 ` Russell King - ARM Linux
2011-10-12 17:35 ` Will Deacon
2011-10-12 18:01 ` Russell King - ARM Linux
2011-10-12 18:05 ` Will Deacon
2011-10-17 8:25 ` Russell King - ARM Linux
2011-10-17 9:23 ` Will Deacon
2011-10-20 14:57 ` Arnd Bergmann
2011-10-21 10:59 ` Will Deacon
2011-10-21 14:48 ` Rob Herring
2011-10-21 15:11 ` Arnd Bergmann
2011-10-21 15:15 ` Will Deacon
2011-10-21 18:03 ` Rob Herring
2011-10-21 23:04 ` Rob Herring
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=201110101320.24457.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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