On Tue, Mar 21, 2006 at 04:34:13PM -0300, Mauro Carvalho Chehab wrote: > It shouldn't have any conflicts here for Linus, since those patches came > from his tree. What do you mean by "those patches came from his tree"? If you're actually cherry-picking patches from his tree and applying them to yours, then you're not reproducing the same commits he has--you're just creating new commits that happen to have nearly identical content. --b. - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html