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

From: David Miller <[email-masked]>
Date: Thu, 26 Feb 2009 23:17:39 -0800 (PST)

From: Stephen Rothwell <[email-masked]>
Date: Thu, 26 Feb 2009 13:48:59 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-tx.c between commit
> 6aa03ab06978e97b3e0720f83280d7841051916b ("Fix iwlan DMA mapping
> direction") from Linus' tree and commit
> 7aaa1d79e3a2d573ac469744506f17b1c9386840 ("iwlwifi: Add TFD library
> operations") from the net tree.
> 
> The latter moved some code that the former modified.  I fixed it up (see
> below) and can carry it for a while.

I'll sort this out, thanks Stephen.