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 <luaran...@gmail.com> --- 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))))))) -- 2.19.1 _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
