From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:60324 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753017AbcIILeG (ORCPT ); Fri, 9 Sep 2016 07:34:06 -0400 Subject: Patch "Revert "can: fix handling of unmodifiable configuration options fix"" has been added to the 3.14-stable tree To: gregkh@linuxfoundation.org, w@1wt.eu Cc: , From: Date: Fri, 09 Sep 2016 13:34:11 +0200 Message-ID: <147342085115940@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled Revert "can: fix handling of unmodifiable configuration options fix" to the 3.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-can-fix-handling-of-unmodifiable-configuration-options-fix.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From cbc6cd716c206318ee61e2432e6430388505db07 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 9 Sep 2016 13:32:42 +0200 Subject: Revert "can: fix handling of unmodifiable configuration options fix" From: Greg Kroah-Hartman This reverts commit 6f8f768a3586b6fbd50e249e7fe4f964a6994685 which was bce271f255dae8335dc4d2ee2c4531e09cc67f5a upstream. It was applied incorrectly, and isn't needed for 3.14-stable. Reported-by: Willy Tarreau Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/net/can/dev.c | 3 --- 1 file changed, 3 deletions(-) --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -665,9 +665,6 @@ static int can_changelink(struct net_dev } } - if (!data) - return 0; - if (data[IFLA_CAN_CTRLMODE]) { struct can_ctrlmode *cm; Patches currently in stable-queue which might be from gregkh@linuxfoundation.org are queue-3.14/revert-can-fix-handling-of-unmodifiable-configuration-options-fix.patch