Re: linux-next: manual merge of the moduleh tree with the net tree

[Paul Gortmaker]

[linux-next: manual merge of the moduleh tree with the net tree] On 28/09/2011 (Wed 16:34) Stephen Rothwell wrote:

> Hi Paul,
> 
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/net/wireless/ath/ath5k/debug.c between commit 931be260ed54
> ("ath5k: clean up base.h and its use") from the net tree and commits
> 9ec3f961e31a ("drivers/net: Add export.h to files using
> EXPORT_SYMBOL/THIS_MODULE") and 0cccb17382f1 ("drivers/net: Add
> moduleparam.h to drivers as required") from the moduleh tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.  (I am
> pretty sure that this file doesn't need module.h, but not completely).

The conflict is gone, but you were correct in your original assessment
that the module.h was no longer needed.  I've added this to the
post-merge queue of patches.

Thanks,
Paul.