From: Luciano Coelho <luciano.coelho@xxxxxxxxx> Date: Mon, 14 Dec 2009 14:32:35 +0200 > Now it's my turn to ask a question... What happens in the case when > there is an API change, say, in mac80211 that requires changes in a > few different drivers? Those changes are usually done in a single > patch that changes both the API and the affected drivers in one go. > In this case we will end up having to rebase our own trees. No you won't need to rebase, that's the last thing you should do. When there is a conflict to resolve or a situation like the one you describe, you simply pull John's tree into your's. -- 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
