From: "John W. Linville" <linville@xxxxxxxxxxxxx> Date: Tue, 2 Oct 2007 21:25:52 -0400 > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-davem This doesn't pull cleanly. Probably you used a recently cloned Linus tree, pulled net-2.6.24 into that (and resolved the conflicts), and then put your patches in. Please don't do it like that, I don't want to pull from a tree that has linus vs. net-2.6.24 conflict handling in it. That's why I usually rebase frequently, to minimize that as much as is humanly possible. What you can do is figure out what linus's HEAD was at the last rebase (basically 'origin' or parent of net-2.6.24), clone that then pull in net-2.6.24, then add your patches. That way I can always do a clean pull. My pull from Jeff today was very clean, for example. I'll add these wireless bits by hand as patches. Thanks John. - To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
