From: pawel.moll@arm.com (Pawel Moll)
To: linux-arm-kernel@lists.infradead.org
Subject: vexpress compilation error in next-20121127
Date: Thu, 29 Nov 2012 11:39:56 +0000 [thread overview]
Message-ID: <1354189196.2987.59.camel@hornet> (raw)
In-Reply-To: <50B679C9.2010808@broadcom.com>
On Wed, 2012-11-28 at 20:53 +0000, Markus Mayer wrote:
> What I am really concerned about is an arm-soc branch that has commit
> 8ac49e0485 in it
> (http://git.kernel.org/?p=linux/kernel/git/arm/arm-soc.git;a=commit;h=8ac49e0485bb79223a111b366a3b1f5ec9148729).
> That commit seems to be in next/soc as well as for-next. Therefore,
> either one might serve my purpose. I am able to build for-next, but
> cannot build next/soc due to the above problem.
>
> Is there a quick way to describe the difference between these two
> branches? I am okay to use for-next rather than next/soc, but I would
> like to know what the difference between the two.
Those are questions to Arnd and Olof, really, but _as far as I
understand_ theirs workflow, they keep pull topic branches from
developers into the respective "next" topic branches (ie. both
vexpress/soc and broadcom/soc got into next/soc), then all the topic
branches are merged into general for-next (so both next/soc and
next/drivers - amongst others - are there).
>Also, is it okay for one of the two branches to temporarily not build
> (as is currently the case with next/soc)?
This is a policy question, again for Arnd and Olof. In my case I had a
long series of changes with internal dependencies and they asked me to
break it into topic branches. Maybe I could have done better job with
that, but other approach would have meant merge conflicts.
Pawe?
next prev parent reply other threads:[~2012-11-29 11:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-28 1:16 vexpress compilation error in next-20121127 Markus Mayer
2012-11-28 12:36 ` Pawel Moll
2012-11-28 20:53 ` Markus Mayer
2012-11-29 11:39 ` Pawel Moll [this message]
2012-11-29 20:03 ` Markus Mayer
2012-12-13 19:07 ` Behan Webster
2012-12-14 9:49 ` Pawel Moll
2012-12-14 14:47 ` Behan Webster
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=1354189196.2987.59.camel@hornet \
--to=pawel.moll@arm.com \
--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