From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail1.ugh.no ([178.79.162.34]:41782 "EHLO mail1.ugh.no"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1726267AbeHWFKO (ORCPT <rfc822;stable@vger.kernel.org>);
        Thu, 23 Aug 2018 01:10:14 -0400
Subject: Re: [GIT PULL] commits for Linux 4.17
To: Sasha Levin <Alexander.Levin@microsoft.com>,
        Greg KH <gregkh@linuxfoundation.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
References: <CY4PR21MB07765564188CD093CE617ADCFB240@CY4PR21MB0776.namprd21.prod.outlook.com>
From: Andre Tomt <andre@tomt.net>
Message-ID: <2ff8aaee-d867-a397-0b00-7eb42f30d8ca@tomt.net>
Date: Thu, 23 Aug 2018 03:37:24 +0200
MIME-Version: 1.0
In-Reply-To: <CY4PR21MB07765564188CD093CE617ADCFB240@CY4PR21MB0776.namprd21.prod.outlook.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On 10. aug. 2018 02:22, Sasha Levin wrote:
<snip>
> Arnaldo Carvalho de Melo (1):
>        tools include uapi: Update if_link.h to pick IFLA_{BRPORT_ISOLATED,VXLAN_TTL_INHERIT}

This commit references two mainline commits:
7d850abd5f4e ("net: bridge: add support for port isolation")
72f6d71e491e ("vxlan: add ttl inherit support")

However they are first seen in 4.18-rc1, and thus makes the 4.17.x 
headers out of sync:

> $ diff -u include/uapi/linux/if_link.h tools/include/uapi/linux/if_link.h
> --- include/uapi/linux/if_link.h	2018-06-03 23:15:21.000000000 +0200
> +++ tools/include/uapi/linux/if_link.h	2018-08-23 03:27:56.185758005 +0200
> @@ -333,6 +333,7 @@
>  	IFLA_BRPORT_BCAST_FLOOD,
>  	IFLA_BRPORT_GROUP_FWD_MASK,
>  	IFLA_BRPORT_NEIGH_SUPPRESS,
> +	IFLA_BRPORT_ISOLATED,
>  	__IFLA_BRPORT_MAX
>  };
>  #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
> @@ -516,6 +517,7 @@
>  	IFLA_VXLAN_COLLECT_METADATA,
>  	IFLA_VXLAN_LABEL,
>  	IFLA_VXLAN_GPE,
> +	IFLA_VXLAN_TTL_INHERIT,
>  	__IFLA_VXLAN_MAX
>  };
>  #define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)


it is 
queue-4.17/tools-include-uapi-update-if_link.h-to-pick-ifla_-brport_isolated-vxlan_ttl_inherit.patch 
in stable-queue.git