On Wed, Feb 29, 2012 at 09:27:18PM +0100, Christian Lamparter wrote: > On Wednesday, February 29, 2012 09:22:03 PM Johannes Berg wrote: > > On Wed, 2012-02-29 at 15:11 -0500, John W. Linville wrote: > > > That commit intended for 3.4 renamed IEEE80211_TX_CTL_POLL_RESPONSE as > > > IEEE80211_TX_CTL_NO_PS_BUFFER. Meanwhile, "carl9170: fix frame delivery > > > if sta is in powersave mode" added a reference to > > > IEEE80211_TX_CTL_POLL_RESPONSE in the fixes stream for 3.3. This simple > > > patch fixes that merge boo-boo. > > > > Thanks, sorry about the overlap. > Err?! I wrote and posted an updated patch on saturday. > > [PATCH -wt] carl9170: fix frame delivery if sta is in powersave mode > http://www.spinics.net/lists/linux-wireless/msg85556.html Indeed, you did. I think the net effect is the same, right? I generally prefer to merge a single fix patch and account for any conflicts in a merge. This one slipped through because of the lack of direct merge breakage. Anyway, it all seems fine now. Thanks, 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
