[GIT PULL] omap fixes against v3.11-rc5

[Olof Johansson]

On Tue, Aug 20, 2013 at 05:32:32AM -0700, Tony Lindgren wrote:
> * Olof Johansson <olof at lixom.net> [130816 15:05]:
> > 
> > Our current fixes branch is based on -rc4, and I didn't see any of
> > these commits in linux-next, so I took the liberty to rebase them back
> > onto our current branch.
> > 
> > I.e. pulled, but rebased.
> 
> Thanks no problem at my end. But to avoid future confusion, what's
> the reasoning for rebasing? AFAIK, pulling this in would have just
> automatically updated your branch to -rc5, no?
> 
> The only time where pulling in a branch based on a later mainline
> commit would cause problems is if your branch is based on another
> series of patches you want to send separately as then you'd get
> all the commits between -rc4 and -rc5 when doing the pull request.
> 
> Probably nothing new in this for your, but FYI, you can use pulling
> or merging branches as a way of updating your publick branches without
> rebasing or adding extra merge commits while keeping the branch
> pullable.
> 
> Let's assume you have arm-soc/fixes based on -rc4, and -rc5
> comes out:
> 
> $ git checkout -b my-fixes-of-the-week v3.11-rc5
> # apply pending patches
> ...
> $ git checkout arm-soc/fixes
> $ git merge my-fixes-of-the-week
> 
> And then you have essentially fast forwarded your arm-soc/fixes to
> -rc5 and it stays pullable ;)

Yeah, it's not that we _can't_ pull it in, it's just that we either need to
merge in -rc5 manually first, or otherwise manually verify diffstat since
it'd otherwise cover the full delta.

My request for people to not always eagerly pick up latest -rc as base for
their branches is new for this release cycle, mostly to see how well it works
out. It would keep the history of our arm-soc changes somewhat cleaner than if
we have new -rcs "anchor in" on the graph in multiple locations like we
sometimes do now. But it might just be annoying for everyone to deal with
complying too, so we'll see how it goes.


-Olof