Messages in this thread | | | Date | Mon, 8 Feb 2010 22:20:44 -0500 | From | "John W. Linville" <> | Subject | Re: linux-next: manual merge of the net tree with the wireless-current tree |
| |
On Tue, Feb 09, 2010 at 01:24:44PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net tree got a conflict in > net/mac80211/scan.c between commit > c0ce77b8323c1a0d4eeef97caf16c0ea971222a9 ("mac80211: fix deferred > hardware scan requests") from the wireless-current tree and commit > af6b63741cc4e4dfd575d06beb333b11a8a6e0c0 ("mac80211: generalise work > handling") from the net tree. > > I resolved this the same way it is resolved in the merge of the > wireless-current tree into the wireless tree.
Maybe it would make sense to pull the wireless trees _before_ the greater net trees? That way you can get the benefit of my merge conflict resolutions automatically.
John -- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |