Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761149Ab3DBJas (ORCPT ); Tue, 2 Apr 2013 05:30:48 -0400 Received: from mga11.intel.com ([192.55.52.93]:61077 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760449Ab3DBJap (ORCPT ); Tue, 2 Apr 2013 05:30:45 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,392,1363158000"; d="scan'208";a="315588967" Date: Tue, 2 Apr 2013 11:30:38 +0200 From: Samuel Ortiz To: Stephen Rothwell , "John W. Linville" Cc: David Miller , netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the net-next tree with the wireless tree Message-ID: <20130402093038.GF17363@zurbaran> References: <20130402130044.ddacc1c990698bd416e4c808@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130402130044.ddacc1c990698bd416e4c808@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 847 Lines: 26 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/ -- 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/