On Jul 9, 2008, at 2:34 AM, Benjamin Herrenschmidt wrote:
I've pushed some updates to my version of powerpc.git.
The tree itself is at:
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
It contains 3 branches:
- merge : this is for merging with the current stable and doesn't
currently contain anything interesting
- master : this is our current "powerpc.git" tree, it may contain
various experimental stuff that may or may not go upstream
or may contain dependent patches that we rely on but that
are to be merged via some other tree.
- next : this is the candidate stuff for linux-next and the next
merge window
(Andrew, you -may- want to pull that instead of paulus one until
he's back from vacation).
Until today, master and next pointed to the same commit, which was
the same as paulus master and powerpc-next branches. Tonight, I've
pushed some patches to master that I intend to have in next, but
I'd like to let them sit in master for a couple of days to make sure
nothing is badly broken mostly and make sure I didn't screw up in
my various patch monkeying operations.
What is your intent with the 'master' branch? I hope you do NOT plan
on ever rebasing it. I assume if a patch gets into master and we drop
it you'll do a git-revert of it?
- k
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
