netdev - linux-next: manual merge of the bluetooth tree with Linus' 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>] [day] [month] [year] [list]

Date:	Fri, 1 Mar 2013 12:54:25 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Gustavo Padovan <gustavo@...ovan.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Ying Xue <ying.xue@...driver.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	Dean Jenkins <Dean_Jenkins@...tor.com>
Subject: linux-next: manual merge of the bluetooth tree with Linus' tree

Hi Gustavo,

Today's linux-next merge of the bluetooth tree got a conflict in
net/bluetooth/rfcomm/core.c between commit 25cc4ae913a4 ("net: remove
redundant check for timer pending state before del_timer") from Linus' tree
and commit 5c87e6efd14d ("Bluetooth: Avoid rfcomm_session_timeout using
freed session") from the bluetooth tree.

I fixed it up (I just used the bluetooth tree version) and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped