[PATCH] ARM: Dove: allow PCI to be disabled

[Nicolas Pitre]

On Mon, 10 Sep 2012, Russell King - ARM Linux wrote:

> On Sun, Sep 09, 2012 at 09:44:22PM -0400, Jason Cooper wrote:
> > iiuc, the regression you are refering to would occur iff this patch
> > (without the select) makes it into mainline _before_ Andrew's patch in
> > Greg's tree.  As I haven't pulled this patch yet, I can add a dependency
> > in the tag message listing the patch in gregkh's usb tree.
> 
> For the regression to occur, you need to land on a commit in the tree
> where this patch (without the select) is in the history but not the
> patch in Greg's tree.
> 
> The commit history remains a series of independent branches even after
> trees are merged into Linus' tree - there is _no_ linearisation of the
> history in git.

@Jason:

The dependency tracking done in the arm-soc tree performed by Arnd and 
Olof is merely a way for you to _base_ your branch on top of other 
people's branch before they pull it from you.  For example, you may 
decide to build your branch on top of Greg's to get some prerequisite 
commits for your work. In that case the goal for the arm-soc maintainers 
is to avoid the situation where a pull of the arm-soc tree into mainline 
would also pull greg's stuff without his asking for it.


Nicolas