From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:53288 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750985AbdEaAQR (ORCPT ); Tue, 30 May 2017 20:16:17 -0400 Subject: Patch "net: fix compile error in skb_orphan_partial()" has been added to the 4.11-stable tree To: edumazet@google.com, davem@davemloft.net, gregkh@linuxfoundation.org, paul.gortmaker@windriver.com, rdunlap@infradead.org, sfr@canb.auug.org.au Cc: , From: Date: Wed, 31 May 2017 09:14:21 +0900 Message-ID: <1496189661179167@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 net: fix compile error in skb_orphan_partial() to the 4.11-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: net-fix-compile-error-in-skb_orphan_partial.patch and it can be found in the queue-4.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Wed May 31 09:13:10 JST 2017 From: Eric Dumazet Date: Tue, 16 May 2017 13:27:53 -0700 Subject: net: fix compile error in skb_orphan_partial() From: Eric Dumazet [ Upstream commit 9142e9007f2d7ab58a587a1e1d921b0064a339aa ] If CONFIG_INET is not set, net/core/sock.c can not compile : net/core/sock.c: In function ‘skb_orphan_partial’: net/core/sock.c:1810:2: error: implicit declaration of function ‘skb_is_tcp_pure_ack’ [-Werror=implicit-function-declaration] if (skb_is_tcp_pure_ack(skb)) ^ Fix this by always including Fixes: f6ba8d33cfbb ("netem: fix skb_orphan_partial()") Signed-off-by: Eric Dumazet Reported-by: Paul Gortmaker Reported-by: Randy Dunlap Reported-by: Stephen Rothwell Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/sock.c | 3 --- 1 file changed, 3 deletions(-) --- a/net/core/sock.c +++ b/net/core/sock.c @@ -138,10 +138,7 @@ #include -#ifdef CONFIG_INET #include -#endif - #include static DEFINE_MUTEX(proto_list_mutex); Patches currently in stable-queue which might be from edumazet@google.com are queue-4.11/ipv6-fix-out-of-bound-writes-in-__ip6_append_data.patch queue-4.11/tcp-eliminate-negative-reordering-in-tcp_clean_rtx_queue.patch queue-4.11/dccp-tcp-do-not-inherit-mc_list-from-parent.patch queue-4.11/tcp-avoid-fragmenting-peculiar-skbs-in-sack.patch queue-4.11/netem-fix-skb_orphan_partial.patch queue-4.11/net-fix-compile-error-in-skb_orphan_partial.patch queue-4.11/ipv6-dccp-do-not-inherit-ipv6_mc_list-from-parent.patch queue-4.11/sctp-do-not-inherit-ipv6_-mc-ac-fl-_list-from-parent.patch queue-4.11/ipv4-add-reference-counting-to-metrics.patch queue-4.11/tcp-avoid-fastopen-api-to-be-used-on-af_unspec.patch