From patchwork Tue Mar 19 06:09:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 10858835 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8E7581390 for ; Tue, 19 Mar 2019 06:09:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7474F28C8D for ; Tue, 19 Mar 2019 06:09:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 689DC28E27; Tue, 19 Mar 2019 06:09:21 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 1465A28C8D for ; Tue, 19 Mar 2019 06:09:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726093AbfCSGJU (ORCPT ); Tue, 19 Mar 2019 02:09:20 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:45336 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725934AbfCSGJU (ORCPT ); Tue, 19 Mar 2019 02:09:20 -0400 Received: by mail-pg1-f195.google.com with SMTP id y3so3912380pgk.12 for ; Mon, 18 Mar 2019 23:09:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=7N1ouRxa4TSFGu4udslbaDq+i5rQRCGlHsRn/0j1M6I=; b=I4QFKd2ipugGCu8RMfGVpXd845Tn1Is9mdtSVRL+k3/v/5P8M+gEUNFophdiEEs5Xp EkMAhAGzXkgByjQEJISFQcjim6bHueHRRXAH73pxVXiQOlWgcnuHgHovmht4f/clK0tZ zwaPL5q0PIy1SU4wtSsnS/1kNihEgtPLjzvGU2FQXXfwB2V1EmzbWIq/FMdiecb023k5 ZtyGdVLH+B4kAYO2AYqtyjDZcEzPv31o2Nd+yBcEGtPxbAh9YrjHjH56PWrYaY32GBll FjO5r19R/SctCSEB8kFrwuO11Q+WxA04siVrw9UoIu+BEBoqFQ+oeYzhtMAU6kWNjGVx 5sGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=7N1ouRxa4TSFGu4udslbaDq+i5rQRCGlHsRn/0j1M6I=; b=TZlekN1FOE2SDMqk84KyUGoMqiMDQ5K67DiXWS/hFLIJK3Iy6dF4ldNVKHGk4huJVj EEaJqM2AA/gIfzQlQ5u9fsqfYdim4ay/3sbd3bc8nHgYqELQcGUr3uJpcR2aPo7E7Jh+ yvp/5I7VCzeLKJRx+oHwZZddecXJQ6SPmE1LI0gLZiIQmTZa9upDqcRYzP92ucC8jMuC 1dczWQ9JtkpCJ3Pggy41TQujMpZnXMiulWIHkuvGqGIBJQXV3FnZ75oHif3yqXWDfhKW rc249mh2P+mUS2iTOnznbDYoo1nJb+s5aevwJwOJudbfmEBElUQ8LA9GaBTUFO6GD17G hzhQ== X-Gm-Message-State: APjAAAUgOzDITkPi3Yl1elOTArbhN8Z+OjicqqfZA6LmxxHjhVqQ1THv wxIMIhZ1BxrpyVAJAQG8oJK9gpkU64w= X-Google-Smtp-Source: APXvYqwMS0opi1voMy/8y0viQGD1A4HB50dfwmZmc/Y24DvfX0tjMMGCn6SblUm0naXDvFCItZgSAA== X-Received: by 2002:a17:902:6804:: with SMTP id h4mr300782plk.115.1552975759736; Mon, 18 Mar 2019 23:09:19 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id x1sm19514951pge.73.2019.03.18.23.09.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Mar 2019 23:09:19 -0700 (PDT) From: AceLan Kao To: hauke@hauke-m.de, mcgrof@kernel.org, backports@vger.kernel.org Subject: [PATCH 1/2] backports: remove mt76.patch Date: Tue, 19 Mar 2019 14:09:14 +0800 Message-Id: <20190319060915.19849-2-acelan.kao@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190319060915.19849-1-acelan.kao@canonical.com> References: <20190319060915.19849-1-acelan.kao@canonical.com> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch patches/0013-fix-makefile-includes/mt76.patch was added in upstream Linux commit 85b7e2acd31b ("mt76: Add missing include of linux/module.h") which was added in v5.1-rc1 Signed-off-by: AceLan Kao --- patches/0013-fix-makefile-includes/mt76.patch | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 patches/0013-fix-makefile-includes/mt76.patch diff --git a/patches/0013-fix-makefile-includes/mt76.patch b/patches/0013-fix-makefile-includes/mt76.patch deleted file mode 100644 index 4f122c46..00000000 --- a/patches/0013-fix-makefile-includes/mt76.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c -+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c -@@ -15,6 +15,7 @@ - */ - #include - #include -+#include - - #include "mt76x0.h" - #include "mcu.h" From patchwork Tue Mar 19 06:09:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 10858837 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 873CA1390 for ; Tue, 19 Mar 2019 06:09:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E5CA28C8D for ; Tue, 19 Mar 2019 06:09:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62C2828E27; Tue, 19 Mar 2019 06:09:23 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 0C1E728C8D for ; Tue, 19 Mar 2019 06:09:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726303AbfCSGJW (ORCPT ); Tue, 19 Mar 2019 02:09:22 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:37110 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725934AbfCSGJW (ORCPT ); Tue, 19 Mar 2019 02:09:22 -0400 Received: by mail-pg1-f196.google.com with SMTP id q206so13141014pgq.4 for ; Mon, 18 Mar 2019 23:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=j0++b0fzdwuZf7R5hW002r1Pov7AleyQ0YEZsDZ6PCY=; b=kJS6fqNBnoj4z7vq7fqw0kZtBP6XNFF8fkuxREcU5dB0jic//1DDCIFFmp9A0Tf/vZ i3qieHD4spOop6cglkMjjEefEvZFfYhbXm681LIb7LUeOlmu78p26yhXhDgXO/ann/N0 mQvJg14sfARmAHog2NjCsnb+1UIXerQawEJgeU19xJ2ToL2QJvnK54srAhVOyWvN+RF9 EMiuD4YjS9ROU4PRRCXmr1EPqfpsdH7T2zYRBDiQ3M6rIT9ClL0n8uXlYUeBiCdX+C80 RKnravb5U5c/pplgz7R76nqDssi7E/g8MmbFZ3dr9kU0SYlrSnY5g70L+ag+jrwxlAuY 2Jrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=j0++b0fzdwuZf7R5hW002r1Pov7AleyQ0YEZsDZ6PCY=; b=CF7TYKotpFlMNM0/zIhJxq4SXl9Ia4aOH+Z9jG4hWp7rpsliO/yMXc/1KKTzpSfGO3 i6gsndlhuaJVaZegb52i6bdTk6G2CBNy635v0Wy4ugwoUtdjFiO/CYW8fO2rJfrTS1yB Hb82aD60Bjf43QFOfN/FWP7+fLFF7XkVh21Bt9Paq5MPiDCj1sl2ZHwyQAPItskvkJhh 9d9fSQOG03swrzEZTCxCYZ472ttaTWUJ6XDrwso+omFud5VEw7bicwBm0bzIkwEx3QyB 2WtQxtz4kX2AghbFKRRbm25/5hZGkIz7/v5BNSlcnwhvaqCuwvAi8+mTFxYNoPj1alH7 wn8g== X-Gm-Message-State: APjAAAXBWufgUH6lED0HdqKJyTBYIngAwggnIMaXCxrwwQ0aF5BWiOfV dxkBbywp8kt67h0dFoKeqmw= X-Google-Smtp-Source: APXvYqyQWvqb1qZkAqk/LkUpVdLb3Fz9yf/KjOcTL/Z4dR76Dyqf8uBB00J1kGXVW8UwBYJQ/O+NLQ== X-Received: by 2002:a17:902:8643:: with SMTP id y3mr306439plt.195.1552975761915; Mon, 18 Mar 2019 23:09:21 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id u13sm19701500pfa.169.2019.03.18.23.09.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Mar 2019 23:09:21 -0700 (PDT) From: AceLan Kao To: hauke@hauke-m.de, mcgrof@kernel.org, backports@vger.kernel.org Subject: [PATCH 2/2] backports: update backport/backport-include/net/netlink.h Date: Tue, 19 Mar 2019 14:09:15 +0800 Message-Id: <20190319060915.19849-3-acelan.kao@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190319060915.19849-1-acelan.kao@canonical.com> References: <20190319060915.19849-1-acelan.kao@canonical.com> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add new macros introduced from 23323289b154 netlink: reduce NLA_POLICY_NESTED{,_ARRAY} arguments Signed-off-by: AceLan Kao --- backport/backport-include/net/netlink.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/backport/backport-include/net/netlink.h b/backport/backport-include/net/netlink.h index 4af73631..6f6630ae 100644 --- a/backport/backport-include/net/netlink.h +++ b/backport/backport-include/net/netlink.h @@ -59,10 +59,14 @@ struct backport_nla_policy { #define NLA_POLICY_ETH_ADDR NLA_POLICY_EXACT_LEN(ETH_ALEN) #define NLA_POLICY_ETH_ADDR_COMPAT NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN) -#define NLA_POLICY_NESTED(maxattr, policy) \ +#define _NLA_POLICY_NESTED(maxattr, policy) \ { .type = NLA_NESTED, .validation_data = policy, .len = maxattr } -#define NLA_POLICY_NESTED_ARRAY(maxattr, policy) \ +#define _NLA_POLICY_NESTED_ARRAY(maxattr, policy) \ { .type = NLA_NESTED_ARRAY, .validation_data = policy, .len = maxattr } +#define NLA_POLICY_NESTED(policy) \ + _NLA_POLICY_NESTED(ARRAY_SIZE(policy) - 1, policy) +#define NLA_POLICY_NESTED_ARRAY(policy) \ + _NLA_POLICY_NESTED_ARRAY(ARRAY_SIZE(policy) - 1, policy) #define __NLA_ENSURE(condition) (sizeof(char[1 - 2*!(condition)]) - 1) #define NLA_ENSURE_INT_TYPE(tp) \