From patchwork Tue Oct 2 10:22:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin 'ldir' Darbyshire-Bryant X-Patchwork-Id: 977696 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=darbyshire-bryant.me.uk Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Yv5hZXua"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=darbyshire-bryant.me.uk header.i=@darbyshire-bryant.me.uk header.b="NOS28Nn4"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PZxC26ckz9sjD for ; Tue, 2 Oct 2018 20:23:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-ID:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=1vuTVXZi2Q2BtfFvQN42f3Oz4hfbiJfxHNyDP0P9pSc=; b=Yv5hZXuausOsc+ bUCOU3NqDp/M4bnIsXT1geX+y1h5A8djydSPzCsbr7T5qk7wjJf9IQPZ8Fo12p7ElhjN35e/3E9it EI/28VX1u6tfwy6z2tjDho4fhCCT87jhAcuZ972lBRla5+LOeaUZo1Y4rdx9U0oCXyQHw8gCCHQsM 8z7//t0xEouDcdDnP1ejVQ19U1FdYKC7ld7hAqDKMBO4/Uc+GCiCwn2NI6F+t8NYVXdqk6okUjYSx mcU/qCyxFRFORMpo0RXD9VitmB6scAkfYrKeAeW9QL8DS6GBQLIx8VZ/ClMgj5KcBNW8cXON/I89b 6J0SwtssvCRg7lMuJ4tg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7Hpl-00077K-Oq; Tue, 02 Oct 2018 10:23:17 +0000 Received: from mail-am5eur03on0618.outbound.protection.outlook.com ([2a01:111:f400:fe08::618] helo=EUR03-AM5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7Hpc-00076P-Tc for openwrt-devel@lists.openwrt.org; Tue, 02 Oct 2018 10:23:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darbyshire-bryant.me.uk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KuWbr7OnsW3eBUtgzsZMO/ugdeDX803iz2a4uhXbsds=; b=NOS28Nn4ybLaCggKZHblvwGKEbfmiXKCEAPXmv6Tm4fFUacuzSgDFnMB3cfPEhjhQxjMv9Xe6UQeRMJsmrXTF+rlwRohAhwHyaHin9oT3zv7k83cByI/52VViXP1r3wLKGrwTyMZRo/B9jjl4/yy5mEIeHja806DiRUo8KDcE38= Received: from VI1PR0302MB2750.eurprd03.prod.outlook.com (10.171.105.143) by VI1PR0302MB2591.eurprd03.prod.outlook.com (10.171.104.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.25; Tue, 2 Oct 2018 10:22:53 +0000 Received: from VI1PR0302MB2750.eurprd03.prod.outlook.com ([fe80::15ff:b45:8d68:9f12]) by VI1PR0302MB2750.eurprd03.prod.outlook.com ([fe80::15ff:b45:8d68:9f12%3]) with mapi id 15.20.1185.024; Tue, 2 Oct 2018 10:22:53 +0000 From: Kevin Darbyshire-Bryant To: "openwrt-devel@lists.openwrt.org" Thread-Topic: [PATCH] kernel: bump 4.14 to 4.14.73 Thread-Index: AQHUWjngxNCVq+vXgEm23J1ROPPGGQ== Date: Tue, 2 Oct 2018 10:22:53 +0000 Message-ID: <20181002102247.67482-1-ldir@darbyshire-bryant.me.uk> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: DB6PR0902CA0027.eurprd09.prod.outlook.com (2603:10a6:6:2::40) To VI1PR0302MB2750.eurprd03.prod.outlook.com (2603:10a6:800:e2::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [46.208.108.24] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR0302MB2591; 6:YQjc9XzkG1a/HYsGL7ZvYxwopTcMqJuM1QUiM9zOUWHXhcsNLlTh8sOLPF5Qw2AfstuCKDWOOIx3+TDle/O3i2BXHwLkz9g0eU7MmaBin5koTteh03htdpJMypm1tgorVi7O0c4q7nmaHvM/CB3tY/JO179jVgLfWgUiAvnalJz0moTCnnVXcOuPjf3g9Do/T1I8etsYUEo9TP40eKTB/zLiRo1XWFfpOA6c8nsDQ/evAxkgginetN9ecHyBdCP38VDln9cSKtiroE7PG9SEIH9VNTxhFxISnaPN+LkSLav40i2uZT6eeruA5pnnZYOaVUsszlQj0TlKzKjeM5LdQdyhpnG01BopVlnHmy79TGaRB9boHhgdg2en4CCZIut3xxOZTeNZyEwpsfdrdXhtuhTOxfHHdfn6ER+Osf1tr6+IPAWy6m6rxNdQQiYrgJfnjvwSR6TVwoxy80Tuz+ZrxA==; 5:YboHaVIRbn4LMH0yyT+Ed7iqJ1qoGys+rfN3rs964Y0zJqEEc8gYrv/z5K6MGMyaj3239MP0moN75QxmJ18yUUxjy3EfxFwnJAk3jpKiAfL0iQPL1EFCgLw6qaKiBk5Z14A337R4qOIp9dPeY7sdU3aK/MCxAtG7Snt6/A2PmKs=; 7:fXtuh3J9liobRicXf3jQlLitG+++Psr5eLvk1w/lN0n/Vko5SVMrbv5yKphFlygkeRwPlVrPlXaG000XIFFzDdK+zxqXOxiDPXWSYBbR/Y6wIHqIfdCP4vP+vejF9+hRWIeFtRwRfUi/ipCe+ZE0cO3vQD0X90cOIjBeOto80ZtizkxSh0/BhpPjn56HOsMhl4CmmYeXYC1HLp0K0lbf9hins2ZDb6WroUcerayQurlTGNsCC1by0d9XJDB1Ka4S x-ms-office365-filtering-correlation-id: 0752f148-320a-4304-01ec-08d628510315 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021145)(8989299)(4534165)(7022145)(4603075)(4627221)(201702281549075)(8990200)(7048125)(7024125)(7027125)(7023125)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:VI1PR0302MB2591; x-ms-traffictypediagnostic: VI1PR0302MB2591: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(58145275503218); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231355)(944501410)(4982022)(52105095)(3002001)(10201501046)(93006095)(93001095)(149066)(150057)(6041310)(2016111802025)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6043046)(201708071742011)(7699051); SRVR:VI1PR0302MB2591; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0302MB2591; x-forefront-prvs: 0813C68E65 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(39830400003)(396003)(346002)(376002)(136003)(199004)(189003)(14444005)(3846002)(53936002)(14454004)(6506007)(1857600001)(6916009)(386003)(186003)(508600001)(68736007)(99286004)(4326008)(316002)(966005)(5660300001)(26005)(2351001)(102836004)(2906002)(81156014)(7736002)(486006)(81166006)(71190400001)(74482002)(71200400001)(66066001)(256004)(107886003)(25786009)(52116002)(8936002)(2501003)(6512007)(1076002)(5250100002)(6306002)(36756003)(105586002)(6436002)(106356001)(2616005)(5640700003)(575784001)(476003)(97736004)(305945005)(2900100001)(8676002)(6116002)(6486002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0302MB2591; H:VI1PR0302MB2750.eurprd03.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) x-microsoft-antispam-message-info: yy4ETtx2yGkQv/50qJ6/trH64o8TXTVRj0cpizjMPmdl8dItq1YsYMuzfRVXI/RWGR5uuYdjUfAOHPJu12QchJUkcjBGASnaaSMU8wNc+dCz6qgLcHJ7795Lh/Q06NIyVkN+fzP7gEy+8Lk4RfUX55nBJrOACiRh3YpK5PzEiHUoBdIiCI1ZA/qpoHb4aKhHm7aRjtjLP8TTmXq5IY9nP6Ly5CzGxkaFprfhwUzT+XQ38BzouqzLGPOpM8p4v5CqSs/h1PBCxxPdVQEDUMx27CSkOJnNiaO02b5TQ7f1A2lEcRWqd8r2nbUJ13ubQ0YcdBNy++BXUimosF0mucfgB7zsHW8EkY3DOxy+fdr2eSk= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-Network-Message-Id: 0752f148-320a-4304-01ec-08d628510315 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Oct 2018 10:22:53.6799 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0302MB2591 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181002_032309_189666_04E45225 X-CRM114-Status: GOOD ( 16.07 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a01:111:f400:fe08:0:0:0:618 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [OpenWrt-Devel] [PATCH] kernel: bump 4.14 to 4.14.73 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Darbyshire-Bryant Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Refresh patches. Remove upstreamed patch: generic/pending-4.14/192-Revert-ubifs-xattr-Don-t-operate-on-deleted-inodes.patch Compile-tested on: ath79 Runtime-tested on: ath79 Signed-off-by: Kevin Darbyshire-Bryant --- This could do with a bit of testing/compilation on a few other platforms include/kernel-version.mk | 4 +- .../910-unaligned_access_hacks.patch | 4 +- .../910-unaligned_access_hacks.patch | 4 +- ...etfilter-flow-table-support-for-IPv6.patch | 4 +- ...ipv6-make-ip6_dst_mtu_forward-inline.patch | 2 +- ...attr-Don-t-operate-on-deleted-inodes.patch | 96 ------------------- ...-support-hardware-flow-table-offload.patch | 2 +- ...-device-to-the-same-MAX-payload-size.patch | 2 +- 8 files changed, 11 insertions(+), 107 deletions(-) delete mode 100644 target/linux/generic/pending-4.14/192-Revert-ubifs-xattr-Don-t-operate-on-deleted-inodes.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 4a734e5688..be4cc67fe1 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -4,11 +4,11 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .123 LINUX_VERSION-4.9 = .129 -LINUX_VERSION-4.14 = .72 +LINUX_VERSION-4.14 = .73 LINUX_KERNEL_HASH-3.18.123 = c10de32c9b31fb619b016a00d77afc394db5a4542e258e927f06a5ead86f8c64 LINUX_KERNEL_HASH-4.9.129 = 6f5510d3fcfec1bf1e2d9c8e2fdcd7628c1886c6bdb29092adc5ccdf75e39318 -LINUX_KERNEL_HASH-4.14.72 = df925906250bbc40fcf0137d7ad0fb8edc528d926832634f1233b7540564557f +LINUX_KERNEL_HASH-4.14.73 = 999e38141ccc447df7bf7ce10b8803c12b32274b76d3d5400bf3fd88eee0e31e remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch index 015c283e1d..ec1d89d6e6 100644 --- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch @@ -303,7 +303,7 @@ #endif /* _LINUX_TYPES_H */ --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c -@@ -1351,8 +1351,8 @@ struct sk_buff **inet_gro_receive(struct +@@ -1352,8 +1352,8 @@ struct sk_buff **inet_gro_receive(struct if (unlikely(ip_fast_csum((u8 *)iph, 5))) goto out_unlock; @@ -567,7 +567,7 @@ goto next_ht; --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c -@@ -220,7 +220,7 @@ static struct sk_buff **ipv6_gro_receive +@@ -221,7 +221,7 @@ static struct sk_buff **ipv6_gro_receive continue; iph2 = (struct ipv6hdr *)(p->data + off); diff --git a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch index d86036fca3..5dec120b03 100644 --- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch @@ -303,7 +303,7 @@ #endif /* _LINUX_TYPES_H */ --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c -@@ -1351,8 +1351,8 @@ struct sk_buff **inet_gro_receive(struct +@@ -1352,8 +1352,8 @@ struct sk_buff **inet_gro_receive(struct if (unlikely(ip_fast_csum((u8 *)iph, 5))) goto out_unlock; @@ -556,7 +556,7 @@ goto next_ht; --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c -@@ -220,7 +220,7 @@ static struct sk_buff **ipv6_gro_receive +@@ -221,7 +221,7 @@ static struct sk_buff **ipv6_gro_receive continue; iph2 = (struct ipv6hdr *)(p->data + off); diff --git a/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch b/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch index cfb13231c6..3e7db09068 100644 --- a/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch +++ b/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch @@ -26,7 +26,7 @@ Signed-off-by: Pablo Neira Ayuso struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6, --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c -@@ -383,7 +383,7 @@ static inline int ip6_forward_finish(str +@@ -381,7 +381,7 @@ static inline int ip6_forward_finish(str return dst_output(net, sk, skb); } @@ -35,7 +35,7 @@ Signed-off-by: Pablo Neira Ayuso { unsigned int mtu; struct inet6_dev *idev; -@@ -403,6 +403,7 @@ static unsigned int ip6_dst_mtu_forward( +@@ -401,6 +401,7 @@ static unsigned int ip6_dst_mtu_forward( return mtu; } diff --git a/target/linux/generic/backport-4.14/350-v4.18-ipv6-make-ip6_dst_mtu_forward-inline.patch b/target/linux/generic/backport-4.14/350-v4.18-ipv6-make-ip6_dst_mtu_forward-inline.patch index f12366f543..daa4d3b3d8 100644 --- a/target/linux/generic/backport-4.14/350-v4.18-ipv6-make-ip6_dst_mtu_forward-inline.patch +++ b/target/linux/generic/backport-4.14/350-v4.18-ipv6-make-ip6_dst_mtu_forward-inline.patch @@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6, --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c -@@ -383,28 +383,6 @@ static inline int ip6_forward_finish(str +@@ -381,28 +381,6 @@ static inline int ip6_forward_finish(str return dst_output(net, sk, skb); } diff --git a/target/linux/generic/pending-4.14/192-Revert-ubifs-xattr-Don-t-operate-on-deleted-inodes.patch b/target/linux/generic/pending-4.14/192-Revert-ubifs-xattr-Don-t-operate-on-deleted-inodes.patch deleted file mode 100644 index cd9a758e37..0000000000 --- a/target/linux/generic/pending-4.14/192-Revert-ubifs-xattr-Don-t-operate-on-deleted-inodes.patch +++ /dev/null @@ -1,96 +0,0 @@ -From a99708737f566c70651015332e89d0d3b1eb5529 Mon Sep 17 00:00:00 2001 -From: Koen Vandeputte -Date: Mon, 17 Sep 2018 10:13:09 +0200 -Subject: [PATCH] Revert "ubifs: xattr: Don't operate on deleted inodes" - -This reverts commit 8a23348d76a1e7716da6e76383281ac82fc071cf. - -UBIFS wants to assert that xattr operations are only issued on files -with positive link count. The said patch made this operations return --ENOENT for unlinked files such that the asserts will no longer trigger. -This was wrong since xattr operations are perfectly fine on unlinked -files. -Instead the assertions need to be fixed/removed. - -Fixes: 11a6fc3dc743 ("ubifs: xattr: Don't operate on deleted inodes") -Reported-by: Koen Vandeputte -Signed-off-by: Richard Weinberger ---- - fs/ubifs/xattr.c | 24 ------------------------ - 1 file changed, 24 deletions(-) - ---- a/fs/ubifs/xattr.c -+++ b/fs/ubifs/xattr.c -@@ -152,12 +152,6 @@ static int create_xattr(struct ubifs_inf - ui->data_len = size; - - mutex_lock(&host_ui->ui_mutex); -- -- if (!host->i_nlink) { -- err = -ENOENT; -- goto out_noent; -- } -- - host->i_ctime = current_time(host); - host_ui->xattr_cnt += 1; - host_ui->xattr_size += CALC_DENT_SIZE(fname_len(nm)); -@@ -189,7 +183,6 @@ out_cancel: - host_ui->xattr_size -= CALC_XATTR_BYTES(size); - host_ui->xattr_names -= fname_len(nm); - host_ui->flags &= ~UBIFS_CRYPT_FL; --out_noent: - mutex_unlock(&host_ui->ui_mutex); - out_free: - make_bad_inode(inode); -@@ -241,12 +234,6 @@ static int change_xattr(struct ubifs_inf - mutex_unlock(&ui->ui_mutex); - - mutex_lock(&host_ui->ui_mutex); -- -- if (!host->i_nlink) { -- err = -ENOENT; -- goto out_noent; -- } -- - host->i_ctime = current_time(host); - host_ui->xattr_size -= CALC_XATTR_BYTES(old_size); - host_ui->xattr_size += CALC_XATTR_BYTES(size); -@@ -268,7 +255,6 @@ static int change_xattr(struct ubifs_inf - out_cancel: - host_ui->xattr_size -= CALC_XATTR_BYTES(size); - host_ui->xattr_size += CALC_XATTR_BYTES(old_size); --out_noent: - mutex_unlock(&host_ui->ui_mutex); - make_bad_inode(inode); - out_free: -@@ -497,12 +483,6 @@ static int remove_xattr(struct ubifs_inf - return err; - - mutex_lock(&host_ui->ui_mutex); -- -- if (!host->i_nlink) { -- err = -ENOENT; -- goto out_noent; -- } -- - host->i_ctime = current_time(host); - host_ui->xattr_cnt -= 1; - host_ui->xattr_size -= CALC_DENT_SIZE(fname_len(nm)); -@@ -522,7 +502,6 @@ out_cancel: - host_ui->xattr_size += CALC_DENT_SIZE(fname_len(nm)); - host_ui->xattr_size += CALC_XATTR_BYTES(ui->data_len); - host_ui->xattr_names += fname_len(nm); --out_noent: - mutex_unlock(&host_ui->ui_mutex); - ubifs_release_budget(c, &req); - make_bad_inode(inode); -@@ -562,9 +541,6 @@ static int ubifs_xattr_remove(struct ino - - ubifs_assert(inode_is_locked(host)); - -- if (!host->i_nlink) -- return -ENOENT; -- - if (fname_len(&nm) > UBIFS_MAX_NLEN) - return -ENAMETOOLONG; - diff --git a/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch index 935b79d1dd..edba04ccf6 100644 --- a/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch +++ b/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch @@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau #include #include #include -@@ -974,8 +979,36 @@ static int pppoe_xmit(struct ppp_channel +@@ -977,8 +982,36 @@ static int pppoe_xmit(struct ppp_channel return __pppoe_xmit(sk, skb); } diff --git a/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch b/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch index 1847c44803..74e78d3b54 100644 --- a/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch +++ b/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch @@ -126,7 +126,7 @@ Signed-off-by: Thomas Petazzoni static int advk_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -959,6 +1014,9 @@ static int advk_pcie_probe(struct platfo +@@ -960,6 +1015,9 @@ static int advk_pcie_probe(struct platfo list_for_each_entry(child, &bus->children, node) pcie_bus_configure_settings(child);