linux-kernel - linux-next: manual merge of the wireless-next 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>] [day] [month] [year] [list]

Message-Id: <20130312120051.5fade9ddf88c9d169d61c655@canb.auug.org.au>
Date:	Tue, 12 Mar 2013 12:00:51 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"John W. Linville" <linville@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Samuel Ortiz <sameo@...ux.intel.com>,
	Thierry Escande <thierry.escande@...ux.intel.com>
Subject: linux-next: manual merge of the wireless-next tree with the
 wireless tree

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
net/nfc/llcp/llcp.c between commit 3536da06db0b ("NFC: llcp: Clean local
timers and works when removing a device") from the wireless tree and
commits d9b8d8e19b07 ("NFC: llcp: Service Name Lookup netlink interface")
and 40213fa8513c ("NFC: llcp: Add cleanup support for unreplied SNL
requests") from the wireless-next tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

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

diff --cc net/nfc/llcp/llcp.c
index b530afa,3361170..0000000
--- a/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp/llcp.c
@@@ -188,16 -156,9 +188,19 @@@ static void local_cleanup(struct nfc_ll
  	cancel_work_sync(&local->rx_work);
  	cancel_work_sync(&local->timeout_work);
  	kfree_skb(local->rx_pending);
 +}
 +
 +static void local_release(struct kref *ref)
 +{
 +	struct nfc_llcp_local *local;
 +
 +	local = container_of(ref, struct nfc_llcp_local, ref);
 +
 +	list_del(&local->list);
 +	local_cleanup(local, false);
+ 	del_timer_sync(&local->sdreq_timer);
+ 	cancel_work_sync(&local->sdreq_timeout_work);
+ 	nfc_llcp_free_sdp_tlv_list(&local->pending_sdreqs);
  	kfree(local);
  }
  

Content of type "application/pgp-signature" skipped