summaryrefslogtreecommitdiff
path: root/meta-aspeed
diff options
context:
space:
mode:
authorJason M. Bills <jason.m.bills@linux.intel.com>2020-03-16 22:22:23 +0300
committerJason M. Bills <jason.m.bills@linux.intel.com>2020-03-16 22:22:23 +0300
commitcde54c4d6f7a200f7df9c301d60c3a9f668fc1db (patch)
tree3d8f007f978ebaf536995870dba6aaa9f1f2436d /meta-aspeed
parent6c1caca70063aa707ba809a6b4695d0f0c5646f1 (diff)
parent182f903f414b31cd1c1aebb11bf476b73490dfad (diff)
downloadopenbmc-cde54c4d6f7a200f7df9c301d60c3a9f668fc1db.tar.xz
Merge tag 'wht-0.44' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-aspeed')
-rw-r--r--meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
index b94783939..28848681c 100644
--- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
+++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
@@ -1,6 +1,6 @@
KBRANCH ?= "dev-5.4"
-LINUX_VERSION ?= "5.4.16"
+LINUX_VERSION ?= "5.4.21"
-SRCREV="86f83a82c7052073cba3db4549233e9c0641484b"
+SRCREV="3589f2ee8207e6fdc8c0633b1965dd280a536282"
require linux-aspeed.inc