From patchwork Fri Oct 13 09:42:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 10003989 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3CFC560216 for ; Fri, 13 Oct 2017 09:42:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30EAF28FFD for ; Fri, 13 Oct 2017 09:42:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25F112900D; Fri, 13 Oct 2017 09:42:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E07EF28FFD for ; Fri, 13 Oct 2017 09:42:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757719AbdJMJmd (ORCPT ); Fri, 13 Oct 2017 05:42:33 -0400 Received: from s3.sipsolutions.net ([144.76.63.242]:49156 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757567AbdJMJmc (ORCPT ); Fri, 13 Oct 2017 05:42:32 -0400 Received: by sipsolutions.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1e2wUB-000389-4a; Fri, 13 Oct 2017 11:42:31 +0200 From: Johannes Berg To: backports@vger.kernel.org Cc: Johannes Berg Subject: [PATCH v2 03/11] copy-list: move mpls includes Date: Fri, 13 Oct 2017 11:42:18 +0200 Message-Id: <20171013094226.10021-3-johannes@sipsolutions.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171013094226.10021-1-johannes@sipsolutions.net> References: <20171013094226.10021-1-johannes@sipsolutions.net> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Berg Signed-off-by: Johannes Berg --- copy-list | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/copy-list b/copy-list index 11fd3455d611..0bd232f44b56 100644 --- a/copy-list +++ b/copy-list @@ -65,6 +65,11 @@ net/Makefile net/Kconfig net/wireless/ net/mac80211/ +# MPLS labels, checked on skb->protocol on the +# respective 802 family, only ethernet seems to use +# this right now, see 960d97f95 +include/linux/mpls.h +include/uapi/linux/mpls.h drivers/net/wireless/ath/ drivers/ssb/ @@ -113,9 +118,3 @@ include/uapi/linux/nfc.h drivers/nfc/ include/linux/platform_data/nfcmrvl.h include/linux/platform_data/nxp-nci.h - -# MPLS labels, checked on skb->protocol on the -# respective 802 family, only ethernet seems to use -# this right now, see 960d97f95 -include/linux/mpls.h -include/uapi/linux/mpls.h