Subject: Re: linux-next: manual merge of the net-next tree with the
 wireless tree
From: "Guy, Wey-Yi" <wey-yi.w.guy@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>, netdev@vger.kernel.org,
        linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Eric Dumazet <eric.dumazet@gmail.com>,
        "John W. Linville" <linville@tuxdriver.com>, alexander.duyck@gmail.com,
        alexander.h.duyck@intel.com, jeffrey.t.kirsher@intel.com,
        linux-wireless@vger.kernel.org
In-Reply-To: <20120504132138.d0142070434e502dfcb8a980@canb.auug.org.au>
References: <20120504132138.d0142070434e502dfcb8a980@canb.auug.org.au>
Content-Type: text/plain; charset="UTF-8"
Date: Thu, 03 May 2012 21:35:30 -0700
Message-ID: <1336106130.11261.5.camel@wwguy-huron>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 883
Lines: 23

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


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/