linux-next: manual merge of the wireless-next tree with thewireless tree

From: Stephen Rothwell
Date: Mon Mar 11 2013 - 21:01:24 EST

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).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

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
+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);

Attachment: pgp00000.pgp
Description: PGP signature