Hi John, On Wed, 2010-03-24 at 16:38 -0700, John W. Linville wrote: > On Wed, Mar 24, 2010 at 03:41:29PM -0700, reinette chatre wrote: > > > I am very sorry, here is the correct link: > > http://git.kernel.org/?p=linux/kernel/git/iwlwifi/iwlwifi-2.6.git;a=commit;h=bc745eb7d28285f3b437c00253bf01ef501eb3f1 > > FWIW, that one misses the definition of iwl_good_ack_health in iwl-core.h. This definition was added in an recent patch "iwlwifi: code cleanup for connectivity recovery" which is already in wireless-next-2.6. > I already put the other one in wireless-next-2.6. I'll just resolve > the conflict when I pull your tree. I'll try to sort this out with our next submission so that there are no conflicts to resolve. Reinette -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
