-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Dave!

On Tue, Aug 09, 2005 at 06:23:33PM -0700, David S. Miller wrote:
> I want some net bug fixes in Linus's tree to propagate into the
> net-2.6.14 tree so I plan to rebase it this evening, so please be
> careful when sync'ing with my tree over the next day.

so what is the actual process of a 'rebase' on your side?  Do you just
pull/update from Linus' current tree and merge it with yours? Or do you
extract all the patches and apply them to a clean linus-tree?

And what is the designated course of action for somebody (like me), who
has based his tree on yours?  I just do 'cg-update origin' and manually
go through the changes, clean them up.  Finally I chekc with 'cg-diff -r
origin' whether there were any mistakes during the manual
cleanup/conflict resolving by making sure it only contains the desired
netfilter-related changes.

Is that the "best current practise", or would you recomment a different
course of action?

- -- 
- - Harald Welte <[EMAIL PROTECTED]>                    http://gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
                                                  (ETSI EN 300 175-7 Ch. A6)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFC+4BtXaXGVTD0i/8RAkenAJ4opuGH/GDxpdLtX/hV1seYCOl8RQCZAe/W
lUn71ubyjlT/VPNBH09hPNg=
=2mfC
-----END PGP SIGNATURE-----
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to