linux-kernel - Re: pull request: bluetooth-next 2014-08-14

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <3B8964A2-1F51-4C62-969A-41F68B5294FA@holtmann.org>
Date:	Fri, 15 Aug 2014 09:32:54 -0700
From:	Marcel Holtmann <marcel@...tmann.org>
To:	"John W. Linville" <linville@...driver.com>
Cc:	"linux-wireless@...r.kernel.org Wireless" 
	<linux-wireless@...r.kernel.org>,
	BlueZ development <linux-bluetooth@...r.kernel.org>,
	linux-kernel@...r.kernel.org
Subject: Re: pull request: bluetooth-next 2014-08-14

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

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