From mboxrd@z Thu Jan  1 00:00:00 1970
From: wwguy <wey-yi.w.guy@intel.com>
Subject: Re: linux-next: manual merge of the net-next tree with the  tree
Date: Mon, 05 Dec 2011 07:42:56 -0800
Message-ID: <1323099776.5536.0.camel@wwguy-ubuntu>
References: <20111205123428.47213da24624d85aa84711f3@canb.auug.org.au>
	 <20111205153416.e1dd01e5368ce7c016d99a59@canb.auug.org.au>
	 <20111205145320.GA2531@tuxdriver.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	David Miller <davem@davemloft.net>,
	"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
	"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"Berg, Johannes" <johannes.berg@intel.com>
To: "John W. Linville" <linville@tuxdriver.com>
Return-path: <linux-next-owner@vger.kernel.org>
In-Reply-To: <20111205145320.GA2531@tuxdriver.com>
Sender: linux-next-owner@vger.kernel.org
List-Id: netdev.vger.kernel.org

On Mon, 2011-12-05 at 06:53 -0800, John W. Linville wrote:
> On Mon, Dec 05, 2011 at 03:34:16PM +1100, Stephen Rothwell wrote:
> > On Mon, 5 Dec 2011 12:34:28 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Today's linux-next merge of the net-next tree got a conflict in
> > > drivers/net/wireless/iwlwifi/iwl-agn.c between commits from the
> > 
> > wireless (sorry)
> > 
> > > tree and commit 7335613ae27a ("iwlwifi: move all mac80211 related
> > > functions to one place") from the net-next tree.
> > > 
> > > I just used the net-next version (which may require some fixes).
> 
> Yeah, I'll try to get that straightened-out over the next day or two.
> 
John, anything I can help?

Thanks
Wey