From patchwork Sun Nov 11 20:59:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Araneda X-Patchwork-Id: 996191 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="j5rE+H9b"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="j5w+S5lg"; 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 42tR9f55Wbz9rxp for ; Mon, 12 Nov 2018 08:00:22 +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=yHfEcApEWJCT88f/3ZVP+ZBvB38Tlo5ft1t5d6wtbEM=; b=j5rE+H9blYzfOU 4UgslhGKLAErICY4uqlm095rsIr4/oDF6+3i5P9ncsNmfxwvTaVpaJagGhPtfNoZrU2dRExkhl389 bFSj9pd8V8UTTinDndAnf0OBuGXQYrWntfjLbyHuKAOlXsAZLgXRePE6PSnwm9ST2w41afL8xPkYW 9Rztxw67vEDhvEM8iNt6BbwAWW04qBKQzu0Rt6dUEtxR72k/fg1dSN3ue1/4PoOVgHLl9UXnx2SWN NzbWIurcGUKNGOTm4sancsbHzm47kapm4bkB8JrKrMqsecjLV8DqKzsiaNHSJeQ4zNj7xwrXSeXD8 jzOVwFhjbMzcIhWXF6Iw==; 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 1gLwqA-0002Kn-AM; Sun, 11 Nov 2018 21:00:18 +0000 Received: from mail-qk1-x744.google.com ([2607:f8b0:4864:20::744]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gLwq6-0001KY-Vz for openwrt-devel@lists.openwrt.org; Sun, 11 Nov 2018 21:00:16 +0000 Received: by mail-qk1-x744.google.com with SMTP id r71so10225348qkr.10 for ; Sun, 11 Nov 2018 13:00:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MwTHqNPpdfjWeNC/hmmmZw1/jTl7KGsw+OvZn2asDN8=; b=j5w+S5lgO0YfjTRhgDyDKnBW7hemYlGgb8Z+O89/Z4klALlBrFtYyLfIBRDG4+6qOQ sPqrBORsEqvry3w3R0qBirtEYpJlZhmpUIsrKpljqUCGwCZGWcrMpeiumX6jqo57GrnC R7vlWIMa0IBLRogN+p+GSXM008ldTKbiRV0lKhrUdc+vWrWQNIL1vpuximbBH6mxGHZb Ur6P5sq+FFnMB/2f0Z7ULulNSexQk6z/BDenc+ngf9bSdCczfIisLFB+3eDCJvSoBipA PSSY4TxtQj82GjhMIFqnh+TLGu4LfuNL1wMFMSGKiDj+mvLohTEI21tc2gIvuE4fVq9x WEYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MwTHqNPpdfjWeNC/hmmmZw1/jTl7KGsw+OvZn2asDN8=; b=Nvf5Uz3doDIDKhrNMXpAgs3D+SoqtwMfdZSk6qt+93n4tkvQeE0s80w9m2Pa1+b5iD F8UrNTjOvzS495q7l/LalzQ60epX41djfNI0hFzQN1d21TtCsWRKtgG29hiiMnTYV5Zc 8frympvk5A5CseITcPFNDk3lVZn7a8GhRz3QPbsihlAxtp5QgxQVEi9ujgAAW5ehqVGJ 3ygwW0ZudrKr/Y7llbGDq4blN3fp3fHGHLnRyQ0Rw13wNO7ByJelJ0WunKlGVgTGSbaP dNLkKb9tSR7C8zlHi6v49vubH9baN4X6Glw3pXKkaZplkkRTXo7w+GvuJUZTirRdGlBc Am2A== X-Gm-Message-State: AGRZ1gJD8GvwvRmK8aNkCLq9oO+90TIkjSbyDS6OVS+u9rjgaS9J67jf IWIAxHFhpuCgori1gYsm/QvzMCl7 X-Google-Smtp-Source: AJdET5c6sk3NheuudX+PwVcHYHHEAOXX4e0862lX8ZdP50WngUjLPTkLe9ATbkPQsysL2iex7PBUsw== X-Received: by 2002:ac8:7518:: with SMTP id u24mr17039049qtq.75.1541970003356; Sun, 11 Nov 2018 13:00:03 -0800 (PST) Received: from asus-S451LA.localdomain (pc-128-176-100-190.cm.vtr.net. [190.100.176.128]) by smtp.gmail.com with ESMTPSA id f75sm11971861qkf.96.2018.11.11.13.00.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Nov 2018 13:00:02 -0800 (PST) From: Luis Araneda To: openwrt-devel@lists.openwrt.org Date: Sun, 11 Nov 2018 17:59:48 -0300 Message-Id: <20181111205948.13073-1-luaraneda@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181111_130015_053216_F0E826C0 X-CRM114-Status: UNSURE ( 8.49 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:744 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (luaraneda[at]gmail.com) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH] kernel-version: group kernel information by version 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: Luis Araneda Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Group kernels by version and add guard-comments to protect against merge conflicts generated by context lines when bumping versions or adding new kernels Signed-off-by: Luis Araneda --- I was trying to rebase the k4.19 PR on github, and then Hauke's k4.19 branch and I found merge conflicts every time, which slowed down my workflow. To test the patch, I created a second patch to simulate a kernel bump and tested it with git am/apply and and quilt push --- include/kernel-version.mk | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index fe20a2654a..4e411bb0a0 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,12 +3,20 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .124 -LINUX_VERSION-4.9 = .135 -LINUX_VERSION-4.14 = .79 - LINUX_KERNEL_HASH-3.18.124 = 25d2a5abd627534a1e51d028890c184aad8e628c345c5fe0cc0f9d7c31b7a5a3 +# k3.18 +# k3.18 +# k3.18 +LINUX_VERSION-4.9 = .135 LINUX_KERNEL_HASH-4.9.135 = e023b0bbe9ea7fc56aa57210342dd18ea3e0900ee207226df1523c6d7df154ce +# k4.9 +# k4.9 +# k4.9 +LINUX_VERSION-4.14 = .79 LINUX_KERNEL_HASH-4.14.79 = 5619071eceb27f903d2fce1784223796bfbe25528f9690273cdfe82fdd9b933a +# k4.14 +# k4.14 +# k4.14 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))