Skip to contentSkip to conversation

FAILED: patch "[PATCH] NFC: st-nci: Remove HCI init_data.gates initialization in" failed to apply to 4.3-stable tree

PATCH [email protected] 2 participants 3 messages Dec 7, 2015 – Dec 9, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 543a0a301fb831f19a37ac06fbe8094e0b5a2c73 Mon Sep 17 00:00:00 2001

From: Christophe Ricard <[email protected]>
Date: Sun, 25 Oct 2015 22:54:26 +0100
Subject: [PATCH] NFC: st-nci: Remove HCI init_data.gates initialization in
load_session

ndev->hci_dev->init_data.gates is already initialized in st_nci_hci_network.

drivers/nfc/st-nci/se.c +0 -3
index 4acb945ac252..3ffac0e67f94 100644
@@ -244,9 +244,6 @@ int st_nci_hci_load_session(struct nci_dev *ndev)
 		kfree_skb(skb_pipe_info);
 	}
 
-	memcpy(ndev->hci_dev->init_data.gates, st_nci_gates,
-	       sizeof(st_nci_gates));
-
 	kfree_skb(skb_pipe_list);
 	return r;
 }
#1 lore raw
Quoted 4 lines · On Sun, 2015-12-06 at 23:40 -0800, [email protected] wrote:

The patch below does not apply to the 4.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

The file to patch is named drivers/nfc/st-nci/st-nci_se.c in 4.3.

Do you need a complete new patch?

Ben.

Quoted 38 lines

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 543a0a301fb831f19a37ac06fbe8094e0b5a2c73 Mon Sep 17 00:00:00 2001
From: Christophe Ricard <[email protected]>
Date: Sun, 25 Oct 2015 22:54:26 +0100
Subject: [PATCH] NFC: st-nci: Remove HCI init_data.gates initialization in load_session

ndev->hci_dev->init_data.gates is already initialized in st_nci_hci_network.

drivers/nfc/st-nci/se.c +0 -0
index 4acb945ac252..3ffac0e67f94 100644
@@ -244,9 +244,6 @@ int st_nci_hci_load_session(struct nci_dev *ndev)
  		kfree_skb(skb_pipe_info);
  	}

drivers/nfc/st-nci/se.c +0 -3
-	memcpy(ndev->hci_dev->init_data.gates, st_nci_gates,
-	       sizeof(st_nci_gates));
-

  kfree_skb(skb_pipe_list);
  return r;
 }

--
To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Signature · 3 lines
Ben Hutchings
Theory and practice are closer in theory than in practice.
                                - John Levine, moderator of comp.compilers
author maintainer
#2 lore raw
Quoted 9 lines · Ben Hutchings
Quoted 4 lines · On Sun, 2015-12-06 at 23:40 -0800, [email protected] wrote:

The patch below does not apply to the 4.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

The file to patch is named drivers/nfc/st-nci/st-nci_se.c in 4.3.

Do you need a complete new patch?

Yes please, I'm buried in stable patches right now and don't have the time to make changes like this to them to get them to apply :(

thanks,

greg k-h