Received: by 2002:ac0:98c7:0:0:0:0:0 with SMTP id g7-v6csp6312408imd; Wed, 31 Oct 2018 09:49:13 -0700 (PDT) X-Google-Smtp-Source: AJdET5fjsszFd95J/s97OGsURAAbwhMz1H5PdgSCbevZamTT6yZO7bAPEzi+lnZednMJpudqxfEg X-Received: by 2002:a63:5442:: with SMTP id e2-v6mr3927522pgm.316.1541004553266; Wed, 31 Oct 2018 09:49:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541004553; cv=none; d=google.com; s=arc-20160816; b=JGPeAuvbAHQpwx/l4D7M0JQ+uJ02p4tiry1jbtoQgp3SSiPIQYeVTx+tgzZ3diit/r Qf2wLu/j5FSAAK0eSkrRWy9JgJ5am5V6UhFyBDYHvyPzYorFpLJLPpqc1KvocVdA3vL7 APl6/qsQqNJYlbeVCVqR7tkcqdaEHFSHgyU4MrzxaYdjYUv1hEBtE45+1TRdkWkAqgpR aY/gHsIyvq+71yXsHo2oFxu2HKKdURwkAFh1hC/5DkdeMvZ0qA4Ky12xMVBHdjZKkfVk b/rcY9cdkk+irTdMSmKb9EtnzsJEMXJyIMkh2j2WCEW4DHLUrzPULUzObdcqslFuebxu YWpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=D8D4lY8GjqHnuCnpnG5Y3aGBlqMSkM1zqXnTq66QuTI=; b=VOgJznA8cErJFizbVU7DIaFcyQA2HbPV3YfRuJNhGUuMbrIueg+/IZA1xd8QdutfHO pj8AxyqYmaFXP1k3VTdM0FEbpOa2FKpmtOkpl/txQUr0ETw76UvhqPHH7yOpLwWtd9H1 Mg13pb86h7ju4DwbWPeARd+WNyFEabYdkhh5ZYVMTT+E/nr0Ys29MsSvwTcBjdmD8rnv MAmSkwz/2/5DicooPAzHuMi0cxrGknc/rMH9X9nc8Niwc2cnzUxwpXVq6Iu/pR4ZwmNZ jxsQuwHSwTfAZeUUMCVSWGCKLidfoR6UQEjFB8lS4Q+kb5oNnRm70l7sfU7dCbGX77cy uYng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="F/EJ7PIO"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r12-v6si27188920pga.346.2018.10.31.09.48.58; Wed, 31 Oct 2018 09:49:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="F/EJ7PIO"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730246AbeKABpb (ORCPT + 99 others); Wed, 31 Oct 2018 21:45:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:60290 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729775AbeKABpa (ORCPT ); Wed, 31 Oct 2018 21:45:30 -0400 Received: from jouet.infradead.org (unknown [179.97.41.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A5A0C2081B; Wed, 31 Oct 2018 16:46:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541004402; bh=jbNLX2xwG09t2YFvgRlBT6MPj05MytAg38EqWTAlehA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F/EJ7PIOVA8Rd7suBrJGDpuGb6wzWbwT6Jgb1m0kfDmQDed93EeF4n3KMkWp/iwki UXlDxEd/cfePM+i7C21KKgC2vNhbvzwjFADpSvyN+nog9rRBk5nGpTkKrBZezgKBRJ ECIQ3L25gpkJvoCGfdVBtzXZ+R43zkoYXFW/mrkg= From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Alexei Starovoitov , "David S . Miller" , Eric Leblond , Nikolay Aleksandrov Subject: [PATCH 24/28] tools headers uapi: Update linux/if_link.h header copy Date: Wed, 31 Oct 2018 13:45:04 -0300 Message-Id: <20181031164508.4784-25-acme@kernel.org> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20181031164508.4784-1-acme@kernel.org> References: <20181031164508.4784-1-acme@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnaldo Carvalho de Melo To pick the changes from: 9163a0fc1f0c ("net: bridge: add support for per-port vlan stats") And silence this build warning: Warning: Kernel ABI header at 'tools/include/uapi/linux/if_link.h' differs from latest version at 'include/uapi/linux/if_link.h' Cc: Alexei Starovoitov Cc: David S. Miller Cc: Eric Leblond Cc: Nikolay Aleksandrov Link: https://lkml.kernel.org/n/tip-7p53ghippywz7fqkwo3nkzet@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/include/uapi/linux/if_link.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/include/uapi/linux/if_link.h b/tools/include/uapi/linux/if_link.h index 58faab897201..1debfa42cba1 100644 --- a/tools/include/uapi/linux/if_link.h +++ b/tools/include/uapi/linux/if_link.h @@ -287,6 +287,7 @@ enum { IFLA_BR_MCAST_STATS_ENABLED, IFLA_BR_MCAST_IGMP_VERSION, IFLA_BR_MCAST_MLD_VERSION, + IFLA_BR_VLAN_STATS_PER_PORT, __IFLA_BR_MAX, }; -- 2.14.4