From: Greg KH <greg@kroah.com> Date: Mon, 11 Feb 2008 21:53:12 -0800Totally agreed. The fact is there are interdependencies, especially in driver land and you have to either: 1) Make the driver folks work on top of Greg's tree. 2) Constantly rebase the -next tree to deal with the conflicts. There are some other issues related to this which haven't be touched upon greatly yet. I rebase my tree all the time, at least once or twice per week. Why? Firstly, to remove crap. When you have "great idea A" then "oh shit A won't work, revert that" there is zero sense in keeping both changesets around. Secondly, I want to fix up the rejects caused by conflicts with upstream bug fixes and the like (and there are tons when the tree gets to 1500 or so patches like the networking did). I don't want git to merge the thing by hand, I want to see what the conflict is and make sure the "obvious" resolution is OK and the most efficient way I know how to do that is to suck my tree apart as patches, then suck them back into a fresh tree. It therefore might make sense to the linux-next tree to do something similar, constantly rebasing so that all the conflicts and reverted shit changes can be sorted out without having an incredibly ugly GIT history. --
| Joe Perches | [PATCH 143/148] include/asm-x86/vm86.h: checkpatch cleanups - formatting only |
| Linus Torvalds | Re: Back to the future. |
| Greg Kroah-Hartman | [PATCH 004/196] Chinese: add translation of SubmittingPatches |
| Trent Piepho | [PATCH] [POWERPC] Improve (in|out)_beXX() asm code |
git: | |
| David Miller | Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
| Gerrit Renker | [PATCH 15/37] dccp: Set per-connection CCIDs via socket options |
| David Miller | [GIT]: Networking |
| Linus Torvalds | Re: iptables very slow after commit 784544739a25c30637397ace5489eeb6e15d7d49 |
