linux-kernel - Re: linux-next: manual merge of the bluetooth tree with the wireless tree

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] [day] [month] [year] [list]

Date:	Tue, 12 Jun 2012 03:11:58 -0300
From:	Gustavo Padovan <gustavo@...ovan.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	"Gustavo F. Padovan" <padovan@...fusion.mobi>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Johan Hedberg <johan.hedberg@...el.com>,
	"John W. Linville" <linville@...driver.com>,
	Marcel Holtmann <marcel@...tmann.org>
Subject: Re: linux-next: manual merge of the bluetooth tree with the wireless
 tree

Hi Stephen,

* Stephen Rothwell <sfr@...b.auug.org.au> [2012-06-12 11:47:01 +1000]:

> Hi Gustavo,
> 
> Today's linux-next merge of the bluetooth tree got a conflict in
> net/bluetooth/hci_event.c between commit 1c2e00418317 ("Bluetooth: Add
> support for encryption key refresh") from the wireless tree and commit
> 6039aa73a132 ("Bluetooth: Remove most of the inline usage") from the
> bluetooth tree.

That is because I just merged bluetooth tree into bluetooth-next, should be
fixed on wireless-next once I do a pull request to John(this is already fixed
in bluetooth-next). Thanks for spotting me this.

	Gustavo

Content of type "application/pgp-signature" skipped