On Wed, Jun 05, 2013 at 08:59:46AM +0200, Johannes Berg wrote: > 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 You are right, I could have done it better with regard to your tree. I probably should redo that part. The Bluetooth tree had pulled the wireless tree and applied their patches on top of the brcmfmac/brcmsmac series that I removed. So, their pull couldn't be redone. I think I can fix the wireless tree and preserve the original mac80211 tree commits. Everyone please hold off on doing anything else here, as I'm a bit busy and won't be able to get to this before this afternoon (Eastern USA time). Anyone object to one more wireless tree rebase today? 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
