From: arnd@arndb•de (Arnd Bergmann)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL] DEBUG_LL platform updates for 3.2
Date: Tue, 11 Oct 2011 15:33:50 +0200 [thread overview]
Message-ID: <201110111533.50768.arnd@arndb.de> (raw)
In-Reply-To: <20111010133246.GG2451@mudshark.cambridge.arm.com>
On Monday 10 October 2011, Will Deacon wrote:
> On Mon, Oct 10, 2011 at 12:20:24PM +0100, Arnd Bergmann wrote:
> > On Monday 10 October 2011, Will Deacon wrote:
> > > 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.
>
> I don't think asking Russell to maintain a stable branch for each series
> scales very well if multiple people are doing cross-platform work at the
> same time. If he's happy merging platform code via his tree, then I'd prefer
> to go down that route. In this case, it might make sense to try and catch
> conflicts between his tree and arm-soc before they hit Linus (I guess -next
> will take care of this?).
Yes, we can definitely spot the conflicts in linux-next, and it gives us
the chance to fix them up, e.g. I can wait with sending the arm-soc
branches upstream until Russell's branches are merged, at which point
I just pull in the branch that was merged into Linus' tree and resolve
all conflicts I get.
> > Can you check if the devel-stable branch in his tree already contains the
> > dependencies?
>
> I just had a quick look and I can't seem them outside of the unstable for-next
> branch.
Ok. I think I'll drop the cpu-mapping branch from arm-soc as well then.
Are the patches in Russell's tree true dependencies for your work, or just
patches touching the same files? If you can send me a branch that contains
only your work without any of the patches that are in an unstable branch
on Russell's side, I could also take them into arm-soc and take care
of the conflicts together with Stephen.
Arnd
next prev parent reply other threads:[~2011-10-11 13:33 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
2011-10-10 13:32 ` Will Deacon
2011-10-11 7:52 ` Shawn Guo
2011-10-11 13:33 ` Arnd Bergmann [this message]
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=201110111533.50768.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