Subject: Re: linux-next: manual merge of the net tree

From: David Miller <[email-masked]>
Date: Wed, 02 Jul 2008 21:14:38 -0700 (PDT)

From: Stephen Rothwell <[email-masked]>
Date: Thu, 3 Jul 2008 14:08:01 +1000

> Hi Dave,
> 
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-4965.c between commit
> ec04fd60fd74a9db9c63fe11d519be3642cabfdd ("iwlwifi: fix incorrect 5GHz
> rates reported in monitor mode") from the wrieless-current tree and
> commit radiotap ("iwlwifi: remove 4965 from iwl4965_rate_info") from the
> net tree.
> 
> I did the obvious fixup (iwl4965_rates -> iwl_rates).

Ok.  As John Linville posted, this was expected :)