[From nobody Thu Jun 25 05:54:42 2020 Received: from mail-he1eur01on061f.outbound.protection.outlook.com ([2a01:111:f400:fe1e::61f] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fVtfe-0005Wg-6X for openwrt-devel@lists.openwrt.org; Thu, 21 Jun 2018 07:06:21 +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=U9EknDIH+vOaoMbhoCwWXPnxGuyrU6uqk7610s4fqN4=; b=e0N4OkLLvFl0zRYRwx8egjcxOjcEaCF6daXid5pjMHPNDjub9lsNoT94gNv330rXxBSVEjpJsoXFrGg9+f/hCeFK1zGgsuzJ9rJlj9fE1v09RVuraKgfx8VXHZ06t2e5Yl95g/RXHyd0rjwMOOY7pGQ8dN/jIHz/3tI0oda1uMY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; Received: from Kevins-MBP.lan.darbyshire-bryant.me.uk (151.229.94.10) by HE1PR07MB4250.eurprd07.prod.outlook.com (2603:10a6:7:9f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.884.16; Thu, 21 Jun 2018 07:06:01 +0000 From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> To: openwrt-devel@lists.openwrt.org Cc: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Subject: [PATCH] kernel: bump 4.14 to 4.14.51 Date: Thu, 21 Jun 2018 08:05:55 +0100 Message-Id: <20180621070555.75585-1-ldir@darbyshire-bryant.me.uk> X-Mailer: git-send-email 2.15.2 (Apple Git-101.1) MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [151.229.94.10] X-ClientProxiedBy: CWLP265CA0017.GBRP265.PROD.OUTLOOK.COM (2603:10a6:401:10::29) To HE1PR07MB4250.eurprd07.prod.outlook.com (2603:10a6:7:9f::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 81fd666f-bc98-41a0-1500-08d5d745725e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:HE1PR07MB4250; X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB4250; 3:WSZIhTrlq3q/RaYF3Jf/4AGgrw0Sq3lyTem6aAtnXYo6w9Hqad56hYoGCinNLBt000ITRaPRKBHTH/S/ZkcrW/+/V5BPOUiD/NPiUNNGE/D8AtxAHTCTfDveqVLWNt5/J1vyLrIgKNV90EoUQEdLRfapEB3UZ/hi0hk9VX++HGcqQENsTLdCtsQ41bN2r/YxXCyv69Aqg+7X3G1YfjuR6y07ANGJ8G/pX2dw1F3Q765zTKALXYEB5GNPvqwJZeLF; 25:VKD14GWN/GKe0Z0rEAPxRvaIPvOqA+ltwSQdBAo3rpNIvv7hWCWnWctLTkQoLXuY0umkQJ4Zp0qXXQLwd+r1klolqxIsT88VoUQvA3RaVMNNLp+zcp6SnglHeyXcAarNVwTWEeyPExj7bD6Qr1BuJNvxJZUNYaKHF1+Inl7De+/YtOcoJxtVxVu7ZStp2N55IPXtqHL5cwGeHeaZpoHxDyI2slZKMB8kTCymCoWbRZX/kQ/8Sl2C3HzdQt4ENaE+h/4zJ+7ZjaWKciDbtSzhSNuEH2FKHD+e9WPhpgkpEVhlTK1UaWKkL+vv2fbbzD5W/U5SzhasgmYmLKsZy/kHkg==; 31:j7fdy2g4vVeaOi3lWjIEYghh+cy1KwhJ1AozAtWU1q68QZPFtjSGeMm5XiVXX76fjnYaWyB81GW02mAsykR3JbiD34QAO6zNMW92KpjvgjyxuTxVOQxIshZAzvwU7ETy7IDvWEsIs7ZMASRP0khdRQAMksRTwf7JD9U3DmIpm3HPiNhJ0Fitt3JRAonB83vNlE9loOppNjXprxDjKhtytKVgkrHeJjcMv946JgU9+xs= X-MS-TrafficTypeDiagnostic: HE1PR07MB4250: X-Microsoft-Antispam-PRVS: <HE1PR07MB4250382457D783A8F55F6E1EA5760@HE1PR07MB4250.eurprd07.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(244540007438412)(209352067349851)(85827821059158); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(20161123560045)(2016111802025)(20161123562045)(20161123558120)(20161123564045)(6043046)(6072148)(201708071742011)(7699016); SRVR:HE1PR07MB4250; BCL:0; PCL:0; RULEID:; SRVR:HE1PR07MB4250; X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB4250; 4:dVEJbnYOBXeyX2umCaN5kq3o3WXxTzeiL3ADXX6rZzxJyncntXzaIlb+Aeey/lbA2zxLcH82JYLUf/WholQ6OdbBxMQwJJvGqfNqobeHsbkLDkySBKW1BxF/FetQ3RlmvwqshAghFauApGWnxf7aFBGcH0qMf+h8+D+j6U7xAz0k4/4Fbgf6vqfo2KVYBgShwKQmJRZEpqx6+V3DBVxkYIFs9HELxQEnhGmq7Mh9MhDZq10nzTrLEcVfH7a5LuECMsl6s1UziWTnWXeE/K8Z//KwBJwLTSqPN/Y1zmXa35aIsu30pdENWe9HDtHehKf5fQ1jmiA2UFrNpjolPtD5HqG+p8oIb+Ndw19M6Ozif72CqJgC2h7sIUxx7ivTo8jD X-Forefront-PRVS: 07106EF9B9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(39380400002)(39830400003)(396003)(346002)(189003)(199004)(50226002)(48376002)(2906002)(52116002)(107886003)(25786009)(16526019)(186003)(53936002)(2361001)(316002)(386003)(26005)(4326008)(68736007)(6116002)(1857600001)(3846002)(16586007)(50466002)(7696005)(59450400001)(1076002)(956004)(476003)(51416003)(486006)(2616005)(575784001)(47776003)(305945005)(6306002)(6916009)(2351001)(8676002)(106356001)(478600001)(8936002)(7736002)(97736004)(36756003)(6486002)(966005)(66066001)(5660300001)(74482002)(81156014)(6666003)(81166006)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR07MB4250; H:Kevins-MBP.lan.darbyshire-bryant.me.uk; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR07MB4250; 23:vjY73lMsnMXaDz0d5EY5DmOtW6HrbM6FJh/qvrWUR?= =?us-ascii?Q?lLy79wUDSVA4GlqZ+gCcC3nZAmgpuUtLTgv0M5ZxOZqCoHoGbyEz0UbwBCBg?= =?us-ascii?Q?BQe8ZWGBvTrmu11f7Il0Uqy3YO7XejB2e8eoY453WhyaeubqVEmLTVUAmg25?= =?us-ascii?Q?VLFtFZlsePHN30KVHRC9U9CWNH2iBW9xFcgiv+zRM0gZgFvdAQS5hgQN8cYL?= =?us-ascii?Q?2N0b9DHLSyV0LMNDGrqrxbRzgKq/C901ZyXLXCG1X7ZqxpPrddsaB8qNhxZU?= =?us-ascii?Q?RlgeednSOWzlucMTpTGECUUOIkHbsDyrpS0rNgT7ejl1iueDm6f/dro6GBwn?= =?us-ascii?Q?juwTyfJAwd0UJ9SjVOrlV53uoLDsdvw6QTh+UpISeiBJ9PUTOFcLyN+FbYdE?= =?us-ascii?Q?hubFqjD2swlIqfSWZgwAchZxdFzORCa5Jv7n/4oWb694p2dqxJHDkLSKDt27?= =?us-ascii?Q?cdiSpMpMdoxF+Pv5VUI+lzdX8krzfujo+e6vcNA+9bQie95iTPd3JDTKSCEU?= =?us-ascii?Q?OLaqBnCSKXWEGki8Lp5p3JJWJA9h3pVHi1+tG2Y8dJEqx/d/+uE8sYlAV3Cl?= =?us-ascii?Q?rzTlnV5Vu2U2jPI/LREYiq7bbk0Lj18EER1o4y1sCxG0Bv/aA+TRkUbM59JK?= =?us-ascii?Q?PRUOQWdCt8xE6rGjW378GMqm3ya5M60rNFDyo+J9Qzsbq70S6WzE+02AQ4h4?= =?us-ascii?Q?NXIs97+xGPkDHCwNoihmZNIKfL3qbsNb1u2dNwFVrLAqSZdya6gPZm/hR9Qo?= =?us-ascii?Q?pNPbWMAbTPpSYyknJilhzHzye5pJKvh/zaZ4qYvL8j3OOjwHhQtZoru4e+Y5?= =?us-ascii?Q?3A0EqYSCOpqGUyEUE5fDsEF++FDDS1l49sSFajYnK3LJxuYJG/RkTb/PZO0m?= =?us-ascii?Q?RZqh0QY9wrlO7vxKV9E1Jk3gIHfWubM0dDPRTTykdDgBlltMcWNYuFDSXMt6?= =?us-ascii?Q?RlYY/+tTyPaGChcidLECqZcfMA7EcAWL2v3UOS1rd8uVfPH9LbF+nZMB5Ek4?= =?us-ascii?Q?OZiaou2VoguW3mAUQg9C++tCEOeBFg4PP5TQFTyw+LYHfGQ3uoLrbIjIa7oO?= =?us-ascii?Q?WhjfQcA7MMkg2AKtAT/5ZZyhnbPydn4JEy9LXV65J69ki2/atAKCr9pQhBVT?= =?us-ascii?Q?snXCWbCq+OhTuwfimXC/sF23+0VwN7A08tQ+XeYj/Nsq5DcmM/WLD2v1b0xg?= =?us-ascii?Q?QNAucQFzu3XUhJ5/YlecMIRYZn+2IP737/SwNGldYLOW2xNInSWmOxKMLZGv?= =?us-ascii?Q?CBvMAjHvGqsP7q1DXv/86Ozf4oqqyw2ND+T87b1NpOm0uCWp5+ImuDWnEz47?= =?us-ascii?B?QT09?= X-Microsoft-Antispam-Message-Info: c9zx094s+BnfXTiALsn412yGQqvlqRkUnhEMk1wJ7faLR3oZoSwahZPqvC3xE5SZOOuVvLR6KCJP7mzJvMk4P8NgjaVnJtlSRku/YIbHzwRsx5l2lrPHFhT2cfeRJVwPJddGclukhuwTg1PqupMwiJ3qkkihfUzdIYkQPas4IPq5FlgdvEqyu+sjLRQ1aqT/eKYbyWX26rns75Jh9K/LuPuJJf74F97e/u8OjELG1x7BvYGsRIRPRIbt9KwFP3/1882366jFsl7ifJVfC04qDFo8O8cpOmFoBf4wuzLi0wCzrYYNS2pHiU04U7QkzoHOovCt/YN5cVF7tX1GAmdGXA== X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB4250; 6:KFa/p0zM9uVFlRNRVk5F9PlOT4f/9MlJy4a1xN5i3w0ntcI50l5kj+NJkjrR3rp+AAaF/nr96pRgFgF2AlGVhi5v5JJ1b361JYAxrbOKGl83d/9PkPQqXVe2R4qLoy3xDjUh02u0POmltMyz/qhaqu8ICqe8hDn1V2kIaOQByjQfIqFhiSr+NCJddcht9oqSmK2KtHF6GwfwcXUeqx3uRzID/OsdVzdYeiSfVxYrbqM0JXSIuEiRdgH7BkdJxjSkuAooreajQVucY/FEX9eHaCk4xoshDZYZsgMRCeoFk5rMcvMtdJe48XrgmYdtpbDO1n2cFqpe67EfRoA+GSLSxERuR7VSf0LKXSfue/zklVA6btypPLnPJKKf0yAl+AnyNB5hqFcn3HRYsVU5XT7O7IBPRA3XfM7hxqgEIix8wMyN20EuBIumz1+paVOrs0+U24cCQm+kMrLS93TMpmDepw==; 5:ek4w8pkgDw9DKCRGWSwq/9I4xUcMlqKkHfyhVbnxVZC5TxnyLIa/LXEKRDUsS5BDrmP/IDH5RIJlUYAWmqisf4Q4Z76oU9FsBHfDwj0dVmKC8+0XoIc+9fHmptCaAQ4fkrgCRKcwyN6H1R+BuR8tESZVu+o1ixd6rgIDSVQAuSw=; 24:a5DmJ1Kq4hJBHmJkxqNAwKxJfmp7Y+BnmRS1wbqZdcDy+wH4VRtjEGJlIgtOPAu6V9OxBTXWCTBT8BcGT3mjKDefrvt6m0O50NbZ1h5TEsU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB4250; 7:S7PNhOyZDD0NWz7eOl83JfYcFX1G3kXKa03kb9ZeiVjY5PAjyko0hoNHMpFNHyWSBTGAKmV6ZbcpvPRln6cHWQyoVPVuGzX5nQPej5LwCUV4MiST7+NRWoyQpbnRJ67h5AUe7Ga0WUnIAnVsFEnVaqrEkWGu1jepDOTpg3rd9Cw/EsKhVwzEnBljZgbJF10oBUwwvp63NpGOZfPfa/3iqaf+xssEjpjm/uIV60L4cR6smmN+rRSZy7BZgCTCQnHB X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2018 07:06:01.2401 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 81fd666f-bc98-41a0-1500-08d5d745725e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR07MB4250 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180621_000618_721867_21ABBA2E X-CRM114-Status: GOOD ( 10.16 ) 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:fe1e:0:0:0:61f 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -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 Refresh patches. Remove patch that can be reverse applied: mvebu/patches-4.14/530-ATA-ahci_mvebu-enable-stop_engine-override.patch Update patch that no longer applied: ipq806x/patches-4.14/0035-clk-mux-Split-out-register-accessors-for-reuse.patch Compiled-tested-for: lantiq, ramips Run-tested-on: lantiq BT hh5a, ramips MIR3g Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> --- include/kernel-version.mk | 4 +- ...stmmac-Disable-frame-filtering-completely.patch | 2 +- ....16-netfilter-flow-table-support-for-IPv6.patch | 2 +- ...r-improve-flow-table-Kconfig-dependencies.patch | 2 +- ...lowtable-infrastructure-depends-on-NETFIL.patch | 2 +- .../650-netfilter-add-xt_OFFLOAD-target.patch | 4 +- .../902-essedma-alloc-skb-ip-align.patch | 7 +- .../patches-4.14/997-device_tree_cmdline.patch | 4 +- ...ux-Split-out-register-accessors-for-reuse.patch | 6 +- .../patches-4.14/0069-arm-boot-add-dts-files.patch | 12 +- .../0012-clk-dont-disable-unused-clocks.patch | 2 +- ...TA-ahci_mvebu-enable-stop_engine-override.patch | 224 --------------------- .../531-ATA-ahci_mvebu-pmp-stop-errata-226.patch | 13 +- 13 files changed, 26 insertions(+), 258 deletions(-) delete mode 100644 target/linux/mvebu/patches-4.14/530-ATA-ahci_mvebu-enable-stop_engine-override.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 825a227915..52a8433ec6 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -5,12 +5,12 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .71 LINUX_VERSION-4.4 = .121 LINUX_VERSION-4.9 = .109 -LINUX_VERSION-4.14 = .50 +LINUX_VERSION-4.14 = .51 LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240 LINUX_KERNEL_HASH-4.4.121 = 44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729 LINUX_KERNEL_HASH-4.9.109 = 3dcd5654a553432119492b69e649c4ed117781bfd571edcb02346c945be359b0 -LINUX_KERNEL_HASH-4.14.50 = 703a8d013b25dc428d936f72858fa0c702c22cb3114a040fb9bb47562e4ea2ac +LINUX_KERNEL_HASH-4.14.51 = dab2402baa2444348f9b3c354e8f65382a466d1766942a57441209f9a2df972b 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/arc770/patches-4.14/700-stmmac-Disable-frame-filtering-completely.patch b/target/linux/arc770/patches-4.14/700-stmmac-Disable-frame-filtering-completely.patch index 58094ae96d..e63c2e934b 100644 --- a/target/linux/arc770/patches-4.14/700-stmmac-Disable-frame-filtering-completely.patch +++ b/target/linux/arc770/patches-4.14/700-stmmac-Disable-frame-filtering-completely.patch @@ -20,7 +20,7 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> --- a/drivers/net/ethernet/stmicro/stmmac/common.h +++ b/drivers/net/ethernet/stmicro/stmmac/common.h -@@ -49,7 +49,7 @@ +@@ -46,7 +46,7 @@ #define STMMAC_GET_ENTRY(x, size) ((x + 1) & (size - 1)) #undef FRAME_FILTER_DEBUG 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 a561f2669d..874195558c 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 @@ -45,7 +45,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> { --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig -@@ -71,6 +71,14 @@ config NFT_FIB_IPV6 +@@ -99,6 +99,14 @@ config NFT_FIB_IPV6 endif # NF_TABLES_IPV6 endif # NF_TABLES diff --git a/target/linux/generic/backport-4.14/329-v4.16-netfilter-improve-flow-table-Kconfig-dependencies.patch b/target/linux/generic/backport-4.14/329-v4.16-netfilter-improve-flow-table-Kconfig-dependencies.patch index c897c36724..7174723fc9 100644 --- a/target/linux/generic/backport-4.14/329-v4.16-netfilter-improve-flow-table-Kconfig-dependencies.patch +++ b/target/linux/generic/backport-4.14/329-v4.16-netfilter-improve-flow-table-Kconfig-dependencies.patch @@ -72,7 +72,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig -@@ -72,8 +72,9 @@ endif # NF_TABLES_IPV6 +@@ -100,8 +100,9 @@ endif # NF_TABLES_IPV6 endif # NF_TABLES config NF_FLOW_TABLE_IPV6 diff --git a/target/linux/generic/backport-4.14/346-v4.16-netfilter-flowtable-infrastructure-depends-on-NETFIL.patch b/target/linux/generic/backport-4.14/346-v4.16-netfilter-flowtable-infrastructure-depends-on-NETFIL.patch index 5267fd2f67..162086e340 100644 --- a/target/linux/generic/backport-4.14/346-v4.16-netfilter-flowtable-infrastructure-depends-on-NETFIL.patch +++ b/target/linux/generic/backport-4.14/346-v4.16-netfilter-flowtable-infrastructure-depends-on-NETFIL.patch @@ -37,7 +37,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig -@@ -73,8 +73,7 @@ endif # NF_TABLES +@@ -101,8 +101,7 @@ endif # NF_TABLES config NF_FLOW_TABLE_IPV6 tristate "Netfilter flow table IPv6 module" diff --git a/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch b/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch index 418ea469e6..308fe0974d 100644 --- a/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch +++ b/target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch @@ -28,7 +28,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> depends on !NF_CONNTRACK || NF_CONNTRACK --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig -@@ -69,7 +69,6 @@ config NFT_FIB_IPV6 +@@ -97,7 +97,6 @@ config NFT_FIB_IPV6 multicast or blackhole. endif # NF_TABLES_IPV6 @@ -36,7 +36,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> config NF_FLOW_TABLE_IPV6 tristate "Netfilter flow table IPv6 module" -@@ -79,6 +78,8 @@ config NF_FLOW_TABLE_IPV6 +@@ -107,6 +106,8 @@ config NF_FLOW_TABLE_IPV6 To compile it as a module, choose M here. diff --git a/target/linux/ipq40xx/patches-4.14/902-essedma-alloc-skb-ip-align.patch b/target/linux/ipq40xx/patches-4.14/902-essedma-alloc-skb-ip-align.patch index 82766c1f2c..8c70fceb01 100644 --- a/target/linux/ipq40xx/patches-4.14/902-essedma-alloc-skb-ip-align.patch +++ b/target/linux/ipq40xx/patches-4.14/902-essedma-alloc-skb-ip-align.patch @@ -8,11 +8,9 @@ Signed-off-by: Chen Minqiang <ptpt52@gmail.com> drivers/net/ethernet/qualcomm/essedma/edma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/net/ethernet/qualcomm/essedma/edma.c b/drivers/net/ethernet/qualcomm/essedma/edma.c -index a3c0d66..29bc9f8 100644 --- a/drivers/net/ethernet/qualcomm/essedma/edma.c +++ b/drivers/net/ethernet/qualcomm/essedma/edma.c -@@ -193,7 +193,7 @@ static int edma_alloc_rx_buf(struct edma_common_info +@@ -201,7 +201,7 @@ static int edma_alloc_rx_buf(struct edma skb = sw_desc->skb; } else { /* alloc skb */ @@ -21,6 +19,3 @@ index a3c0d66..29bc9f8 100644 if (!skb) { /* Better luck next round */ break; --- -2.17.1 - diff --git a/target/linux/ipq40xx/patches-4.14/997-device_tree_cmdline.patch b/target/linux/ipq40xx/patches-4.14/997-device_tree_cmdline.patch index 51a35c17d9..8b5e64a2d4 100644 --- a/target/linux/ipq40xx/patches-4.14/997-device_tree_cmdline.patch +++ b/target/linux/ipq40xx/patches-4.14/997-device_tree_cmdline.patch @@ -1,12 +1,12 @@ --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c -@@ -1127,6 +1127,9 @@ int __init early_init_dt_scan_chosen(uns +@@ -1130,6 +1130,9 @@ int __init early_init_dt_scan_chosen(uns p = of_get_flat_dt_prop(node, "bootargs", &l); if (p != NULL && l > 0) strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE)); + p = of_get_flat_dt_prop(node, "bootargs-append", &l); + if (p != NULL && l > 0) + strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE)); - + /* * CONFIG_CMDLINE is meant to be a default in case nothing else diff --git a/target/linux/ipq806x/patches-4.14/0035-clk-mux-Split-out-register-accessors-for-reuse.patch b/target/linux/ipq806x/patches-4.14/0035-clk-mux-Split-out-register-accessors-for-reuse.patch index 0d919ee668..e65ca02980 100644 --- a/target/linux/ipq806x/patches-4.14/0035-clk-mux-Split-out-register-accessors-for-reuse.patch +++ b/target/linux/ipq806x/patches-4.14/0035-clk-mux-Split-out-register-accessors-for-reuse.patch @@ -135,14 +135,14 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> if (mux->lock) spin_lock_irqsave(mux->lock, flags); else -@@ -102,14 +121,14 @@ static int clk_mux_set_parent(struct clk +@@ -110,14 +129,14 @@ static int clk_mux_determine_rate(struct } const struct clk_ops clk_mux_ops = { - .get_parent = clk_mux_get_parent, + .get_parent = _clk_mux_get_parent, .set_parent = clk_mux_set_parent, - .determine_rate = __clk_mux_determine_rate, + .determine_rate = clk_mux_determine_rate, }; EXPORT_SYMBOL_GPL(clk_mux_ops); @@ -152,7 +152,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> }; EXPORT_SYMBOL_GPL(clk_mux_ro_ops); -@@ -117,7 +136,7 @@ struct clk_hw *clk_hw_register_mux_table +@@ -125,7 +144,7 @@ struct clk_hw *clk_hw_register_mux_table const char * const *parent_names, u8 num_parents, unsigned long flags, void __iomem *reg, u8 shift, u32 mask, diff --git a/target/linux/ipq806x/patches-4.14/0069-arm-boot-add-dts-files.patch b/target/linux/ipq806x/patches-4.14/0069-arm-boot-add-dts-files.patch index 59f37a7027..b94e4828c9 100644 --- a/target/linux/ipq806x/patches-4.14/0069-arm-boot-add-dts-files.patch +++ b/target/linux/ipq806x/patches-4.14/0069-arm-boot-add-dts-files.patch @@ -11,9 +11,9 @@ Signed-off-by: John Crispin <john@phrozen.org> --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -699,6 +699,16 @@ dtb-$(CONFIG_ARCH_QCOM) += \ - qcom-apq8084-mtp.dtb \ - qcom-ipq4019-ap.dk01.1-c1.dtb \ - qcom-ipq8064-ap148.dtb \ + qcom-apq8084-mtp.dtb \ + qcom-ipq4019-ap.dk01.1-c1.dtb \ + qcom-ipq8064-ap148.dtb \ + qcom-ipq8064-c2600.dtb \ + qcom-ipq8064-d7800.dtb \ + qcom-ipq8064-db149.dtb \ @@ -24,6 +24,6 @@ Signed-off-by: John Crispin <john@phrozen.org> + qcom-ipq8064-wpq864.dtb \ + qcom-ipq8065-nbg6817.dtb \ + qcom-ipq8065-r7800.dtb \ - qcom-msm8660-surf.dtb \ - qcom-msm8960-cdp.dtb \ - qcom-msm8974-lge-nexus5-hammerhead.dtb \ + qcom-msm8660-surf.dtb \ + qcom-msm8960-cdp.dtb \ + qcom-msm8974-lge-nexus5-hammerhead.dtb \ diff --git a/target/linux/mediatek/patches-4.14/0012-clk-dont-disable-unused-clocks.patch b/target/linux/mediatek/patches-4.14/0012-clk-dont-disable-unused-clocks.patch index ed4111dce3..33ede7d3a6 100644 --- a/target/linux/mediatek/patches-4.14/0012-clk-dont-disable-unused-clocks.patch +++ b/target/linux/mediatek/patches-4.14/0012-clk-dont-disable-unused-clocks.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c -@@ -796,7 +796,7 @@ unlock_out: +@@ -797,7 +797,7 @@ unlock_out: clk_core_disable_unprepare(core->parent); } diff --git a/target/linux/mvebu/patches-4.14/530-ATA-ahci_mvebu-enable-stop_engine-override.patch b/target/linux/mvebu/patches-4.14/530-ATA-ahci_mvebu-enable-stop_engine-override.patch deleted file mode 100644 index 2d56749607..0000000000 --- a/target/linux/mvebu/patches-4.14/530-ATA-ahci_mvebu-enable-stop_engine-override.patch +++ /dev/null @@ -1,224 +0,0 @@ -From fa89f53bd7288d6aa7a982841119e7123faf5a53 Mon Sep 17 00:00:00 2001 -From: Evan Wang <xswang@marvell.com> -Date: Fri, 13 Apr 2018 12:32:30 +0800 -Subject: [PATCH] libahci: Allow drivers to override stop_engine - -Marvell armada37xx, armada7k and armada8k share the same -AHCI sata controller IP, and currently there is an issue -(Errata Ref#226)that the SATA can not be detected via SATA -Port-MultiPlayer(PMP). After debugging, the reason is -found that the value of Port-x FIS-based Switching Control -(PxFBS@0x40) became wrong. -According to design, the bits[11:8, 0] of register PxFBS -are cleared when Port Command and Status (0x18) bit[0] -changes its value from 1 to 0, i.e. falling edge of Port -Command and Status bit[0] sends PULSE that resets PxFBS -bits[11:8; 0]. -So it needs save the port PxFBS register before PxCMD -ST write and restore the port PxFBS register afterwards -in ahci_stop_engine(). - -This commit allows drivers to override ahci_stop_engine -behavior for use by the Marvell AHCI driver(and potentially -other drivers in the future). - -Signed-off-by: Evan Wang <xswang@marvell.com> -Cc: Ofer Heifetz <oferh@marvell.com> -Cc: Tejun Heo <tj@kernel.org> -Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> -Signed-off-by: Tejun Heo <tj@kernel.org> ---- - drivers/ata/ahci.c | 6 +++--- - drivers/ata/ahci.h | 7 +++++++ - drivers/ata/ahci_qoriq.c | 2 +- - drivers/ata/ahci_xgene.c | 4 ++-- - drivers/ata/libahci.c | 20 ++++++++++++-------- - drivers/ata/sata_highbank.c | 2 +- - 6 files changed, 26 insertions(+), 15 deletions(-) - -diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c -index 1ff17799769d0..6389c88b3500a 100644 ---- a/drivers/ata/ahci.c -+++ b/drivers/ata/ahci.c -@@ -698,7 +698,7 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, - - DPRINTK("ENTER\n"); - -- ahci_stop_engine(ap); -+ hpriv->stop_engine(ap); - - rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context), - deadline, &online, NULL); -@@ -724,7 +724,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, - bool online; - int rc; - -- ahci_stop_engine(ap); -+ hpriv->stop_engine(ap); - - /* clear D2H reception area to properly wait for D2H FIS */ - ata_tf_init(link->device, &tf); -@@ -788,7 +788,7 @@ static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class, - - DPRINTK("ENTER\n"); - -- ahci_stop_engine(ap); -+ hpriv->stop_engine(ap); - - for (i = 0; i < 2; i++) { - u16 val; -diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h -index a9d996e17d75e..824bd399f02ea 100644 ---- a/drivers/ata/ahci.h -+++ b/drivers/ata/ahci.h -@@ -365,6 +365,13 @@ struct ahci_host_priv { - * be overridden anytime before the host is activated. - */ - void (*start_engine)(struct ata_port *ap); -+ /* -+ * Optional ahci_stop_engine override, if not set this gets set to the -+ * default ahci_stop_engine during ahci_save_initial_config, this can -+ * be overridden anytime before the host is activated. -+ */ -+ int (*stop_engine)(struct ata_port *ap); -+ - irqreturn_t (*irq_handler)(int irq, void *dev_instance); - - /* only required for per-port MSI(-X) support */ -diff --git a/drivers/ata/ahci_qoriq.c b/drivers/ata/ahci_qoriq.c -index 2685f28160f70..cfdef4d44ae92 100644 ---- a/drivers/ata/ahci_qoriq.c -+++ b/drivers/ata/ahci_qoriq.c -@@ -96,7 +96,7 @@ static int ahci_qoriq_hardreset(struct ata_link *link, unsigned int *class, - - DPRINTK("ENTER\n"); - -- ahci_stop_engine(ap); -+ hpriv->stop_engine(ap); - - /* - * There is a errata on ls1021a Rev1.0 and Rev2.0 which is: -diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c -index c2b5941d9184d..ad58da7c9affd 100644 ---- a/drivers/ata/ahci_xgene.c -+++ b/drivers/ata/ahci_xgene.c -@@ -165,7 +165,7 @@ static int xgene_ahci_restart_engine(struct ata_port *ap) - PORT_CMD_ISSUE, 0x0, 1, 100)) - return -EBUSY; - -- ahci_stop_engine(ap); -+ hpriv->stop_engine(ap); - ahci_start_fis_rx(ap); - - /* -@@ -421,7 +421,7 @@ static int xgene_ahci_hardreset(struct ata_link *link, unsigned int *class, - portrxfis_saved = readl(port_mmio + PORT_FIS_ADDR); - portrxfishi_saved = readl(port_mmio + PORT_FIS_ADDR_HI); - -- ahci_stop_engine(ap); -+ hpriv->stop_engine(ap); - - rc = xgene_ahci_do_hardreset(link, deadline, &online); - -diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index 7adcf3caabd00..e5d90977caec2 100644 ---- a/drivers/ata/libahci.c -+++ b/drivers/ata/libahci.c -@@ -560,6 +560,9 @@ void ahci_save_initial_config(struct device *dev, struct ahci_host_priv *hpriv) - if (!hpriv->start_engine) - hpriv->start_engine = ahci_start_engine; - -+ if (!hpriv->stop_engine) -+ hpriv->stop_engine = ahci_stop_engine; -+ - if (!hpriv->irq_handler) - hpriv->irq_handler = ahci_single_level_irq_intr; - } -@@ -897,9 +900,10 @@ static void ahci_start_port(struct ata_port *ap) - static int ahci_deinit_port(struct ata_port *ap, const char **emsg) - { - int rc; -+ struct ahci_host_priv *hpriv = ap->host->private_data; - - /* disable DMA */ -- rc = ahci_stop_engine(ap); -+ rc = hpriv->stop_engine(ap); - if (rc) { - *emsg = "failed to stop engine"; - return rc; -@@ -1310,7 +1314,7 @@ int ahci_kick_engine(struct ata_port *ap) - int busy, rc; - - /* stop engine */ -- rc = ahci_stop_engine(ap); -+ rc = hpriv->stop_engine(ap); - if (rc) - goto out_restart; - -@@ -1549,7 +1553,7 @@ int ahci_do_hardreset(struct ata_link *link, unsigned int *class, - - DPRINTK("ENTER\n"); - -- ahci_stop_engine(ap); -+ hpriv->stop_engine(ap); - - /* clear D2H reception area to properly wait for D2H FIS */ - ata_tf_init(link->device, &tf); -@@ -2075,14 +2079,14 @@ void ahci_error_handler(struct ata_port *ap) - - if (!(ap->pflags & ATA_PFLAG_FROZEN)) { - /* restart engine */ -- ahci_stop_engine(ap); -+ hpriv->stop_engine(ap); - hpriv->start_engine(ap); - } - - sata_pmp_error_handler(ap); - - if (!ata_dev_enabled(ap->link.device)) -- ahci_stop_engine(ap); -+ hpriv->stop_engine(ap); - } - EXPORT_SYMBOL_GPL(ahci_error_handler); - -@@ -2129,7 +2133,7 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep) - return; - - /* set DITO, MDAT, DETO and enable DevSlp, need to stop engine first */ -- rc = ahci_stop_engine(ap); -+ rc = hpriv->stop_engine(ap); - if (rc) - return; - -@@ -2189,7 +2193,7 @@ static void ahci_enable_fbs(struct ata_port *ap) - return; - } - -- rc = ahci_stop_engine(ap); -+ rc = hpriv->stop_engine(ap); - if (rc) - return; - -@@ -2222,7 +2226,7 @@ static void ahci_disable_fbs(struct ata_port *ap) - return; - } - -- rc = ahci_stop_engine(ap); -+ rc = hpriv->stop_engine(ap); - if (rc) - return; - -diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c -index aafb8cc035232..e67815b896fcc 100644 ---- a/drivers/ata/sata_highbank.c -+++ b/drivers/ata/sata_highbank.c -@@ -410,7 +410,7 @@ static int ahci_highbank_hardreset(struct ata_link *link, unsigned int *class, - int rc; - int retry = 100; - -- ahci_stop_engine(ap); -+ hpriv->stop_engine(ap); - - /* clear D2H reception area to properly wait for D2H FIS */ - ata_tf_init(link->device, &tf); - diff --git a/target/linux/mvebu/patches-4.14/531-ATA-ahci_mvebu-pmp-stop-errata-226.patch b/target/linux/mvebu/patches-4.14/531-ATA-ahci_mvebu-pmp-stop-errata-226.patch index e71cc0c49f..764953257a 100644 --- a/target/linux/mvebu/patches-4.14/531-ATA-ahci_mvebu-pmp-stop-errata-226.patch +++ b/target/linux/mvebu/patches-4.14/531-ATA-ahci_mvebu-pmp-stop-errata-226.patch @@ -33,12 +33,10 @@ Signed-off-by: Tejun Heo <tj@kernel.org> drivers/ata/ahci_mvebu.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) -diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c -index de7128d81e9cc..0045dacd814b4 100644 --- a/drivers/ata/ahci_mvebu.c +++ b/drivers/ata/ahci_mvebu.c -@@ -62,6 +62,60 @@ static void ahci_mvebu_regret_option(struct ahci_host_priv *hpriv) - writel(0x80, hpriv->mmio + AHCI_VENDOR_SPECIFIC_0_DATA); +@@ -116,6 +116,60 @@ int ahci_mvebu_stop_engine(struct ata_po + return 0; } +/** @@ -98,13 +96,12 @@ index de7128d81e9cc..0045dacd814b4 100644 #ifdef CONFIG_PM_SLEEP static int ahci_mvebu_suspend(struct platform_device *pdev, pm_message_t state) { -@@ -112,6 +166,8 @@ static int ahci_mvebu_probe(struct platform_device *pdev) - if (rc) - return rc; +@@ -168,6 +222,8 @@ static int ahci_mvebu_probe(struct platf + + hpriv->stop_engine = ahci_mvebu_stop_engine; + hpriv->stop_engine = ahci_mvebu_stop_engine; + if (of_device_is_compatible(pdev->dev.of_node, "marvell,armada-380-ahci")) { dram = mv_mbus_dram_info(); - -- 2.15.2 (Apple Git-101.1) ]