diff options
author | Joel Stanley <joel@jms.id.au> | 2018-06-20 14:12:33 +0930 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-21 14:09:38 +0000 |
commit | 9eed65c47c42ded820068798f142d1c64a0572fd (patch) | |
tree | 2cdb967123c133f3ea0b37a91bc7d21d7a1593b6 /meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux | |
parent | 5946406a029c35f4475e1bb312d487ba0626f8d6 (diff) | |
download | talos-openbmc-9eed65c47c42ded820068798f142d1c64a0572fd.tar.gz talos-openbmc-9eed65c47c42ded820068798f142d1c64a0572fd.zip |
linux: Merge 4.17.2 stable release
This merges the 4.17.2 upstream stable tree into the dev-4.17 openbmc
tree.
Change-Id: Ide27501337065cfa6c28e168fb18c02447d407ba
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux')
-rw-r--r-- | meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 7aa1d4e3f..a172cc867 100644 --- a/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-4.17" -LINUX_VERSION ?= "4.17" +LINUX_VERSION ?= "4.17.2" -SRCREV="635177a5c64fa51c04f317d61c9a642205c05750" +SRCREV="977d10e476de13d33f793f71ff9480fc15d99bb7" require linux-aspeed.inc |