|
It's best to use palinux to do the merge in order to keep network traffic
to a minimum, but it's not strictly necessary.
# Set the version number we're going to be merging
$ VERS=2.6.19-rc1
# Get the existing head of our tree
$ cd merge-2.6
$ git-pull
# Update the `linus' branch in the merge repo
# I have an additional remotes file which lets me just git-fetch linus
$ git-fetch git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git master:linus
# Push the linus branch into our shared repo, and any new tags
$ git-push origin linus:linus
$ git-push --tags origin
# Make sure the merge tree has no uncomitted changes in it
$ git-checkout -f
# Do the merge from a tag so it's repeatable
$ git-pull origin refs/tags/v$VERS
# Fix up conflicts
$ vi ...
# Commit the merge
# Don't forget to remove the conflicts section from the merge message
$ git-commit -a
# Tag the merge
$ git-tag -a -m "parisc-linux ${VERS}-pa0" v${VERS}-pa0
# Let everybody see the merge
$ git-push origin master:master
$ git-push --tags origin
| 
