Re: linux-next: manual merge of the net-next tree with the wireless tree
From: Guy, Wey-Yi <hidden>
Date: 2012-05-04 04:42:09
Also in:
linux-next, lkml, netdev
On Fri, 2012-05-04 at 13:21 +1000, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the net-next tree got conflicts in
drivers/net/wireless/iwlwifi/iwl-trans.h,
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c, and
drivers/net/wireless/iwlwifi/iwl-agn-rx.c between commit ed90542b0ce5
("iwlwifi: fix skb truesize underestimation") from the wireless tree and
various commits from the net-next tree.
This was anticipated and I have applied the fix supplied by John (see
below just to check). Thanks to John for this!Thanks everyone to help address this, it is my miss to cause all these trouble Wey