Return-Path: Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: pull request: bluetooth-next 2014-08-14 From: Marcel Holtmann In-Reply-To: <20140815144545.GL4953@tuxdriver.com> Date: Fri, 15 Aug 2014 09:32:54 -0700 Cc: "linux-wireless@vger.kernel.org Wireless" , BlueZ development , linux-kernel@vger.kernel.org Message-Id: <3B8964A2-1F51-4C62-969A-41F68B5294FA@holtmann.org> References: <20140814145000.GA14226@t440s.P-661HNU-F1> <20140815144545.GL4953@tuxdriver.com> To: "John W. Linville" Sender: linux-wireless-owner@vger.kernel.org List-ID: Hi John, >> Here's our first bluetooth-next pull request for the 3.18 kernel. Our >> tree is based on net-next so you'd need to pull from there first before >> pulling from our tree. > > What did you need from net-next that made you base on that instead > of wireless-next? I generally like to decide for myself what level > of net-next needs to be the base of wireless-next... mainly the merge conflict resolution for 6lowpan and all the ieee802154 patches before we ended up taking this through bluetooth-next. It just made sense to start out with a clean base tree in this case. If you prefer, then we can just do that against a new wireless-next tree once you have that ready. I honestly just assumed you are going to pull net-next anyway. So my apologizes for that. Regards Marcel