From: Alexandros Couloumbis <alex@ozo.com>
Date: Sat, 29 Aug 2020 09:50:01 +0000 (+0300)
Subject: Merge branch 'master' into ozonet
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=d88042e97e5a2285b448aff69a2767e4dcc02bad;p=openwrt%2F.git

Merge branch 'master' into ozonet
---

d88042e97e5a2285b448aff69a2767e4dcc02bad
diff --cc include/kernel-version.mk
index b555407f2b,007ae358cd..befc384aa1
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@@ -6,13 -6,13 +6,13 @@@ ifdef CONFIG_TESTING_KERNE
    KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
  endif
  
 -LINUX_VERSION-4.14 = .193
 +LINUX_VERSION-4.14 = .194
  LINUX_VERSION-4.19 = .138
- LINUX_VERSION-5.4 = .59
+ LINUX_VERSION-5.4 = .60
  
 -LINUX_KERNEL_HASH-4.14.193 = 0b0fb41d4430e1a42738b341cbfd2f41951aa5cd02acabbd53f076119c8b9f03
 +LINUX_KERNEL_HASH-4.14.194 = 3ea4d0221a071d58703cd346a8a6ef1582a32a8c4565a4919578817444d4fae0
  LINUX_KERNEL_HASH-4.19.138 = d15c27d05f6c527269b75b30cc72972748e55720e7e00ad8abbaa4fe3b1d5e02
- LINUX_KERNEL_HASH-5.4.59 = 9bcb9db2e4435f2e5948375862baf0973f1d7860ebe3d750383e5a6deac4b2fd
+ LINUX_KERNEL_HASH-5.4.60 = add2ab2385c40fc9a3dfebe403e56da8500b633dc7dc42cf0c670c61d151a223
  
  remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
  sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))