On Tue, May 08, 2012 at 10:43:01PM -0400, John W. Linville wrote: > Regrettably, I found it necessary to rebase the wireless-next tree > starting from commit 94c514fe. If you maintain a tree derived from > wireless-next then you may need to adjust your tree accordingly. > > I apologize for the inconvenience! I should note that I pulled back from net-next into wireless-next as part of this process. This was necessary to resolve some continuing merge issues related to the NLA_PUT_* removal. This also means that net-next bits have made their way into wireless-testing much earlier than they usually would have done so. Again, I apologize for the inconvenience and/or confusion that this might cause. Please bear through this with me. John -- John W. Linville Someday the world will need a hero, and you linville@xxxxxxxxxxxxx might be all we have. Be ready. -- 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