stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* FAILED: patch "[PATCH] NFC: st-nci: Remove HCI init_data.gates initialization in" failed to apply to 4.3-stable tree
@ 2015-12-07  7:40 gregkh
  2015-12-07 18:18 ` Ben Hutchings
  0 siblings, 1 reply; 3+ messages in thread
From: gregkh @ 2015-12-07  7:40 UTC (permalink / raw)
  To: christophe.ricard, christophe-h.ricard, sameo; +Cc: stable


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 <stable@vger.kernel.org>.

thanks,

greg k-h

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

>From 543a0a301fb831f19a37ac06fbe8094e0b5a2c73 Mon Sep 17 00:00:00 2001
From: Christophe Ricard <christophe.ricard@gmail.com>
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.

Cc: stable@vger.kernel.org
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c
index 4acb945ac252..3ffac0e67f94 100644
--- a/drivers/nfc/st-nci/se.c
+++ b/drivers/nfc/st-nci/se.c
@@ -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;
 }


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: FAILED: patch "[PATCH] NFC: st-nci: Remove HCI init_data.gates initialization in" failed to apply to 4.3-stable tree
  2015-12-07  7:40 FAILED: patch "[PATCH] NFC: st-nci: Remove HCI init_data.gates initialization in" failed to apply to 4.3-stable tree gregkh
@ 2015-12-07 18:18 ` Ben Hutchings
  2015-12-07 21:04   ` Greg KH
  0 siblings, 1 reply; 3+ messages in thread
From: Ben Hutchings @ 2015-12-07 18:18 UTC (permalink / raw)
  To: gregkh, christophe.ricard, christophe-h.ricard, sameo; +Cc: stable

[-- Attachment #1: Type: text/plain, Size: 1865 bytes --]

On Sun, 2015-12-06 at 23:40 -0800, gregkh@linuxfoundation.org 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 <stable@vger.kernel.org>.

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.

> thanks,
> 
> greg k-h
> 
> ------------------ original commit in Linus's tree ------------------
> 
> From 543a0a301fb831f19a37ac06fbe8094e0b5a2c73 Mon Sep 17 00:00:00 2001
> From: Christophe Ricard <christophe.ricard@gmail.com>
> 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.
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
> 
> diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c
> index 4acb945ac252..3ffac0e67f94 100644
> --- a/drivers/nfc/st-nci/se.c
> +++ b/drivers/nfc/st-nci/se.c
> @@ -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;
>  }
> 
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
-- 
Ben Hutchings
Theory and practice are closer in theory than in practice.
                                - John Levine, moderator of comp.compilers

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: FAILED: patch "[PATCH] NFC: st-nci: Remove HCI init_data.gates initialization in" failed to apply to 4.3-stable tree
  2015-12-07 18:18 ` Ben Hutchings
@ 2015-12-07 21:04   ` Greg KH
  0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2015-12-07 21:04 UTC (permalink / raw)
  To: Ben Hutchings; +Cc: christophe.ricard, christophe-h.ricard, sameo, stable

On Mon, Dec 07, 2015 at 06:18:04PM +0000, Ben Hutchings wrote:
> On Sun, 2015-12-06 at 23:40 -0800, gregkh@linuxfoundation.org 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 <stable@vger.kernel.org>.
> 
> 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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-12-09  0:47 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-07  7:40 FAILED: patch "[PATCH] NFC: st-nci: Remove HCI init_data.gates initialization in" failed to apply to 4.3-stable tree gregkh
2015-12-07 18:18 ` Ben Hutchings
2015-12-07 21:04   ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).