On Tue, 2013-06-04 at 17:53 -0400, John W. Linville wrote: > I messed this up too -- bad day... > > If you pulled in between the earlier message and this one, please > do so again. If you saw this message before taking any action to > clean-up my mess, then you are OK. This was confusing, I think you rebased around some merges instead of redoing the merges? My patches are in, but suddenly got new commit IDs, e.g. fa331699d05ce1d0d4896eb4a137cfae50d7afde (new) vs. c2c15e215e860c99b86ddfc4be4bb25cf180fed0 for "mac80211: work around broken APs not including HT info". This will cause git to pull them in again when I send a new pull request, so it would have been nicer to redo the merges, but anyway ... just a heads-up for everyone that here it's a bit confusing now. johannes -- 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