linux-kernel - Re: linux-next: manual merge of the wireless tree with the wireless-current 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, 21 Jun 2011 15:05:21 -0300
From:	"Gustavo F. Padovan" <padovan@...fusion.mobi>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	"John W. Linville" <linville@...driver.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Johan Hedberg <johan.hedberg@...el.com>
Subject: Re: linux-next: manual merge of the wireless tree with the
 wireless-current tree

Hi John,

* Stephen Rothwell <sfr@...b.auug.org.au> [2011-06-21 11:49:57 +1000]:

> Hi John,
> 
> Today's linux-next merge of the wireless tree got a conflict in
> net/bluetooth/l2cap_core.c between commit df3c3931ec58 ("Bluetooth: Fix
> accepting connect requests for defer_setup") from the wireless-current
> tree and commit ab07801d2898 ("Bluetooth: create channel timer to replace
> sk_timer") from the wireless tree.

I merged bluetooth-2.6 and bluetooth-next-2.6 to fix this and will send a pull
request to you in a minute.

	Gustavo
--
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/