From patchwork Wed Jan 10 14:06:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kevin 'ldir' Darbyshire-Bryant X-Patchwork-Id: 858309 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dgKJ5xmk"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=darbyshire-bryant.me.uk header.i=@darbyshire-bryant.me.uk header.b="OKq/hKfE"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 3zGrS621Ptz9s0g for ; Thu, 11 Jan 2018 01:07:34 +1100 (AEDT) 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=TRx6jgFk27R0xSnfHWzJ6bXgVpEVYmmdwQoLglhliQI=; b=dgKJ5xmkwLATnC dt+TUohAgbNH6lnJhO8AID7DXcVV1DcpYRCGmpLCNFvjtTkKj98tqHqAUtVLTC1Ip3llixuSVzrdO WoMt6kc91O5/d/hfMwWu1+QbtyNg7ZdPrS8aDD2u81WNTHx52d9eHD/MlOpmscY/0bpu3TaHFfMBB Naa/qJfzsfZaBOdjM49dfeczrpAkCVq03c9jGITjIWjuNZSXOYR+wJZvlGR0hekONfKl2/Jc/Z9ZB sEfzvhzmoN/4Dra1NxReR7MeVhEpzE6PKvI/hohKAGRel+eO/vwEVt7mRUkbe6pG9/sYDMtPoSXY0 539g3C95z5+07AAHv0IQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eZH2I-00024V-Uq; Wed, 10 Jan 2018 14:07:22 +0000 Received: from mail-he1eur01on0625.outbound.protection.outlook.com ([2a01:111:f400:fe1e::625] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eZH2A-0001pv-1y for lede-dev@lists.infradead.org; Wed, 10 Jan 2018 14:07: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; bh=q3vMXuRU3JPy/ACQo8rxZm/jDJQplaDyzVs3gBRGMmM=; b=OKq/hKfEebPsQdYyFe6i25qxyxSkyGOuXH6juMy+ao/+uwcNgB4Xj+PS3I5D3kxZG1cPM0I/1f6OfwqQjf9/MxkByNDHr7xAZiWcDutDfGhE8vBAtvqbNH8R0ROJ1UAkvCT8zMmbK6GsXYSqzWpFt9OGU4afKD/J90qCFESz8tk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; Received: from Rowlf.darbyshire-bryant.me.uk (151.227.238.51) by AM0PR0702MB3731.eurprd07.prod.outlook.com (2603:10a6:208:26::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.1; Wed, 10 Jan 2018 14:06:57 +0000 From: Kevin Darbyshire-Bryant To: lede-dev@lists.infradead.org Date: Wed, 10 Jan 2018 14:06:52 +0000 Message-Id: <20180110140652.19813-1-ldir@darbyshire-bryant.me.uk> X-Mailer: git-send-email 2.14.3 (Apple Git-98) MIME-Version: 1.0 X-Originating-IP: [151.227.238.51] X-ClientProxiedBy: VI1PR0902CA0005.eurprd09.prod.outlook.com (2603:10a6:800:d7::15) To AM0PR0702MB3731.eurprd07.prod.outlook.com (2603:10a6:208:26::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d7ef433d-4c2d-4a5c-633c-08d55833697d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4603075)(4627115)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:AM0PR0702MB3731; X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3731; 3:Rv4x9nV+Bd1yySVsgW4njqEVFOYpx0Zi69LpJ2peD2t/cfdLN0JaxyyO1kp48SNgRm8HtoEdBQxpGw9JmNUHZ4QF3fQJs57kCEJXGaQIYifcwzGrnsIOJbZH0ImpGz/S9e+hRnYioPpqxaF4NgsVdmgynhWTJBqNiXVbnJIkJOuyQk/YxYSVQpeEOi6+fU4vMDGxWRrcwHdKiarIcxtDsLA//XS0AQJvdn25FpSDKQjVdZAVFC9jcPQ4VZ/OJAuL; 25:5ZQ3/pdQQJRP/Ar2TiTmgCtPypDoNj8znyK1ZDM1PYJAzRIHAUTdJxf0RtIyTN+CrXpPMJ9FwhYaVKDSnYFmh/AvKy96gXUw+UXZT3SuT7UYjfKsS6adBtAEK5efAl5xGsOB8Yz/3gqlJlC1kkLb95TVgmzZ81geQFDd45nZzQJgdawiSSYqh1ZSDT4K1mRTZsX/IOJjCYIzM1WvG0lEO52YnTZIKdLSZJhEtvuRbguAggrTrEcnSu0x2YxK6BGeNHofPpb/zczDnqqzvzfkyhELgePn4qhxsD92BIdXreM02WNPTTXELteVCebC/NZmbIh2DCO/gmx2W9fSUlrRtw==; 31:PXlbXgs+JdxWkoMhOHiEfKNGJzlovi9Xq7+2sGsudIWFCs3S4AcV4qJ+QtiVES3y7G5yTl68DRsE3oWrAtDoNcjgC9a9sufUz4xyr5ZEFL74pDKqQ3H/HewDOxImidokTj4Ov7CoZ4++QUhkHfFuBFvRgdTKatF2iAQhd5VeeR0g69nConJzuF5ENaTIGAqW9ffgf/JgJxQ9yCvcKL0xeBFKepeOMRBuhRLMI44xwdw= X-MS-TrafficTypeDiagnostic: AM0PR0702MB3731: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85827821059158); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231023)(944501075)(6041268)(20161123558120)(2016111802025)(201703131423095)(20161123555045)(201703061421075)(20161123562045)(20161123564045)(20161123560045)(6072148)(6043046)(201708071742011); SRVR:AM0PR0702MB3731; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM0PR0702MB3731; X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3731; 4:bOcuYpK5S4PuQ7ci5d0MlHu8lBJVWoIjjLeyy8nDVrHOascPyMucCGZqaITqTfd/6tugnJACpdHWNwSPbRC9hvp3Rm0brAs/AvI5aow0fAvezUmlwNvYl7a1ZTX/IADRmZTbnjv1YxITHeu9dFt3eCrULATi+hNpinuZ4aHwCoxodMEkUkpWplXzvC81UtPoSLVTJzwafLMPt+4MBn+0zPhZhRx9KKY4dXak64/+x5XyzbewibvsmH+7tOHyHz0+VeAcoXyD47vZbWSru08kzlVQcCb85G93TpVdhslBaYLDT0jE+kVvPH4nAwgJu8LP X-Forefront-PRVS: 0548586081 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(346002)(39380400002)(189003)(199004)(5423002)(105586002)(36756003)(7736002)(5660300001)(305945005)(97736004)(2361001)(6666003)(47776003)(2351001)(66066001)(2870700001)(69596002)(50466002)(74482002)(16526018)(42882006)(6916009)(106356001)(23676004)(7696005)(52116002)(508600001)(4326008)(59450400001)(575784001)(8676002)(386003)(81166006)(2906002)(25786009)(53936002)(107886003)(81156014)(1076002)(50226002)(8936002)(68736007)(6116002)(3846002)(53416004)(6486002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0702MB3731; H:Rowlf.darbyshire-bryant.me.uk; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BAM0PR0702MB3731=3B23=3A9e?= =?utf-8?q?p5eH5HqW28on8wYe1ugxZ83Yqg3ujsvDHqf23LCdgRSa8mcyIJ0NGnKv?= =?utf-8?q?xjhbERfftw28AiNnXShctsj4qQDb+wtoQgXe+poBP/9/fk0oVvcZHQQn?= =?utf-8?q?Cu5gDAkn4iKiziATo/RQD+gdeecEVFZ71WhLCPpIZUx4GVjokNRYzh/Q?= =?utf-8?q?Qt69UZH3sdFwUBa/3Z/4bd3jgub/cPbU/3k0gPlkfIRZm7gZb40Gt1T9?= =?utf-8?q?G5wsBoraCwrGNiiNV7uTm+Q9/hJWqUNC7MaKwYjO9rG98VmXccLZEvwC?= =?utf-8?q?lFOfUZVwYcwvL18Pm53ClKsPks0a12Mtvcc6gHaJMEhx3c6vEFa5n6w0?= =?utf-8?q?8csbgc7k/uV7iQJnGBJa1iZ7UbJF7i1QBF0Y+KG1l+abJco9nVhXG3/Z?= =?utf-8?q?FPZaFJEopqwKCrSIEBfaz/oGr3EorHbe9wTOzyXo8kM4vtkWXO5VNbuB?= =?utf-8?q?AR+0/27EVx5IIdIN6Awg1DOY/CBwDNUtllKnjbJYZUMqd+EbXZMsMWmF?= =?utf-8?q?D+Zvu3qEbYVCVNzo7KB/pXe6wxf7nw5HnTvR2QjA/JBajIldawDaFOf6?= =?utf-8?q?mCeBhHFnny+r3G5h6ht6JKKlKvTm/DBZK5cS9AeNWHdNPvym/0wAmk4Q?= =?utf-8?q?/JE7nZKG1bNbZAF4EL/WXg7dF+utWVtESf5UcC4PCXPRdYy5VbIQtj8N?= =?utf-8?q?ZykihBQYTRXToHo4IcvtPZ5doJ+5labC39GvrUDjRdDYXqx/KYP0cFRE?= =?utf-8?q?c1jQkQj8lWVakyoA5jNxIyPpuKeMmJE5jJG8EYZlWMP2kPWm8QOnyOpw?= =?utf-8?q?fGIz5Rru93KGMQ/GoXAsCDJfT/R+Wt4DgTPtkCWsq5j2mURvsgODoHZ4?= =?utf-8?q?50KCjlVqjLvXhiy2tGIfLjvkJUGsk2WK1wuY4wAOaLW/Z/Tk/Gz5eF+F?= =?utf-8?q?5jciLGN69KVBHqA4WO0rEA05HGQAL/pM3ci3zTDEt20uYgxOvvZ/M7zT?= =?utf-8?q?NGDV5ZkkVNFh6+D6NLE5BqOhDAx9NMGXNTugWSOxXGT1Sq2Bex9Jpjsy?= =?utf-8?q?ZA2JRjvZReoqUcKVeHFD+cvuRzO4apRw2ZWkMLAVLiRmS1HuPQf1Gqay?= =?utf-8?q?Dvf+1PAtaThCDnVJ1wn1+0ZRg4tkaux6Ytv8gtwZLO/vWiufnJuvHV9T?= =?utf-8?q?hVPhSpri0DjS/Rv3aaJku2FjREL0XB?= X-Microsoft-Exchange-Diagnostics: 1; AM0PR0702MB3731; 6:va4kWA2l0KIFe5y5nD5CVJFzsu6isFPOh6qA+apCiG6kBwdlnDG/C3KOiGmSRo112KJQ7J+mvrgz3uD9iAlauXvRZXeFMxjMlWC+VF5yVKc7Lhfq+wRDwODb8X9/+SiZ1Y+NK3QSqJt4Yn4z200qXnFdsXvHJ3zrDLpO4ZswNu5dmA710jtP1SJ7WVzPcQ5UvzzEYeI9oX9f6G+4dWM38AX2Q8PmFf7Sw5phEMynCdlEPzG1CFAhHVT/JGhi3xQkYUatkCYLOpAX+6SkdZsyrQngxe9p1VUhfl5CNLhw4H7iJiAeoNRWLRi9qBBU/xMUSw+9ql8elimHGwSdUyJmapqX6FLuH6H29wTTIC2WW3U=; 5:i9raDIMSVZ4jNrV48SBVNZbkiK1h+GcevXuKG7oY+KtNSyukI2a6vuFj4UIu8Vv/cAmCzOeo4heewboCA8rZndS2SVlgCQKM4tMpUYB1lPDNy77SZQP+3L4AcPF+ykHTGECFHEaehCNWIFL4D8Qs2SLWnPGVmGFeuO4FNdOU3hg=; 24:dwUArYB2e4fYF43+YPd16ImznCuPLNnq8Ff4+cWPKo55DYYCibSqgjk28S2ij7cxWUrgEwHWVQTyS4WxQYSGei4JUr//TFCIZUBVs/lcurQ=; 7:KscxA50+r0/QCnOrxO2Rao5XprVUSo9fXoxMcS3rekN4ezqSxIGp70y6EsZIgwJWldy+d4ooXDEkS3VxzpmAiuqQDxPHieCyxLaeFIPD7r0CmVQWaBFHp71llfFeCIdLUzW9xC6BmP1BeVhNXDiGolcL6NLFRw1D+QemnGANFmKv4ILoiJIY+Y61pgyV0LS3sLwvAHBgW1njwLqQfB10nJB2b4XZUIvWiUlqF9scfjA9S28y14iRQsC98lDD1262 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2018 14:06:57.6850 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d7ef433d-4c2d-4a5c-633c-08d55833697d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0702MB3731 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180110_060714_394645_56C489CB X-CRM114-Status: UNSURE ( 7.91 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 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:625 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -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: [LEDE-DEV] [PATCH v1] kernel: bump 4.14 to 4.14.13 X-BeenThere: lede-dev@lists.infradead.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: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Refresh patches Signed-off-by: Kevin Darbyshire-Bryant --- include/kernel-version.mk | 4 ++-- .../octeon/patches-4.14/110-er200-ethernet_probe_order.patch | 6 +++--- target/linux/octeon/patches-4.14/160-cmdline-hack.patch | 8 ++++---- target/linux/octeon/patches-4.14/170-cisco-hack.patch | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 2b1b0b9fb2..1827c21838 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 = .110 LINUX_VERSION-4.9 = .75 -LINUX_VERSION-4.14 = .12 +LINUX_VERSION-4.14 = .13 LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240 LINUX_KERNEL_HASH-4.4.110 = d099175aac5678e6cad2f23cd56ed22a2857143c0c18489390c95ba8c441db58 LINUX_KERNEL_HASH-4.9.75 = de6c31b7668d4047e370f4625362a02b9ebf7da56d5c0879a4961f620ab1cadf -LINUX_KERNEL_HASH-4.14.12 = 6608f7d480efc5c1078888e9344f4e0b0cd9bef0b6541cbdaec7d138e03856af +LINUX_KERNEL_HASH-4.14.13 = 4ab46d1b5a0f8ef83b80760f89ae4f5c88431b19b3cf79ffa0c66d6b33e45772 ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) diff --git a/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch index 1df3f6a675..6b1eaf92a2 100644 --- a/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch +++ b/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch @@ -1,14 +1,14 @@ --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -684,6 +684,7 @@ static int cvm_oct_probe(struct platform +@@ -673,6 +673,7 @@ static int cvm_oct_probe(struct platform int interface; int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE; int qos; + int i; struct device_node *pip; + int mtu_overhead = ETH_HLEN + ETH_FCS_LEN; - octeon_mdiobus_force_mod_depencency(); -@@ -800,13 +801,19 @@ static int cvm_oct_probe(struct platform +@@ -796,13 +797,19 @@ static int cvm_oct_probe(struct platform } num_interfaces = cvmx_helper_get_number_of_interfaces(); diff --git a/target/linux/octeon/patches-4.14/160-cmdline-hack.patch b/target/linux/octeon/patches-4.14/160-cmdline-hack.patch index 2a4ad1dc73..e902e853e8 100644 --- a/target/linux/octeon/patches-4.14/160-cmdline-hack.patch +++ b/target/linux/octeon/patches-4.14/160-cmdline-hack.patch @@ -1,6 +1,6 @@ --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c -@@ -656,6 +656,35 @@ void octeon_user_io_init(void) +@@ -650,6 +650,35 @@ void octeon_user_io_init(void) write_c0_derraddr1(0); } @@ -36,12 +36,12 @@ /** * Early entry point for arch setup */ -@@ -900,6 +929,8 @@ void __init prom_init(void) +@@ -894,6 +923,8 @@ void __init prom_init(void) } } + octeon_use_image_cmdline(); + if (strstr(arcs_cmdline, "console=") == NULL) { - #ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL - strcat(arcs_cmdline, " console=ttyS0,115200"); + if (octeon_uart == 1) + strcat(arcs_cmdline, " console=ttyS1,115200"); diff --git a/target/linux/octeon/patches-4.14/170-cisco-hack.patch b/target/linux/octeon/patches-4.14/170-cisco-hack.patch index 124bcfd7a7..72774209dc 100644 --- a/target/linux/octeon/patches-4.14/170-cisco-hack.patch +++ b/target/linux/octeon/patches-4.14/170-cisco-hack.patch @@ -18,7 +18,7 @@ Signed-off-by: Michał Osowiecki --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c -@@ -1005,6 +1005,10 @@ void __init plat_mem_setup(void) +@@ -1018,6 +1018,10 @@ void __init plat_mem_setup(void) if (mem_alloc_size > max_memory) mem_alloc_size = max_memory;