From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Ortiz Subject: Re: linux-next: manual merge of the net-next tree with the wireless tree Date: Tue, 2 Apr 2013 11:30:38 +0200 Message-ID: <20130402093038.GF17363@zurbaran> References: <20130402130044.ddacc1c990698bd416e4c808@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: David Miller , netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org To: Stephen Rothwell , "John W. Linville" Return-path: Content-Disposition: inline In-Reply-To: <20130402130044.ddacc1c990698bd416e4c808@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Hi John, Stephen, On Tue, Apr 02, 2013 at 01:00:44PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in > drivers/nfc/microread/mei.c between commit 9593b0b1179c ("NFC: microread: > Fix build failure due to a new MEI bus API") from the wireless tree and > commit 63cd353c34a0 ("NFC: microread: Fix MEI build failure") from the > net-next tree. John, sorry for the conflict. I sent a patch to John for wireless-next that will fix it once it ends up in net-next. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/