diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-15 11:09:09 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-15 21:53:27 +0100 |
| commit | 3967376eb73acd8948f510462bd266fb8c9e95d6 (patch) | |
| tree | e18fd48a3fd8e1016e24ed7f0024822b646a33c6 | |
| parent | 276d8b86a7df6e3802bed7fedb89af07058c1572 (diff) | |
| download | upstream-3967376eb73acd8948f510462bd266fb8c9e95d6.tar.gz upstream-3967376eb73acd8948f510462bd266fb8c9e95d6.tar.bz2 upstream-3967376eb73acd8948f510462bd266fb8c9e95d6.zip | |
kernel: bump 4.14 to 4.14.101
Refreshed all patches.
Fixes:
- CVE-2019-3819
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
| -rw-r--r-- | include/kernel-version.mk | 4 | ||||
| -rw-r--r-- | target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 80f78b2b6b..af7b5cd8a7 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -4,12 +4,12 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .134 LINUX_VERSION-4.9 = .158 -LINUX_VERSION-4.14 = .99 +LINUX_VERSION-4.14 = .101 LINUX_VERSION-4.19 = .21 LINUX_KERNEL_HASH-3.18.134 = 36bdd04cab3b6c824a4b7e32ae02503f437e0916d5a4ff04c90aa22da2749c2f LINUX_KERNEL_HASH-4.9.158 = 8c8a69f590e6f1103c949b45ff1bfd42c705388321f75e1520be3556f81375ef -LINUX_KERNEL_HASH-4.14.99 = 8ff98caed5b20b733dedcbe99559d71a0e09e239c0c2488b3fd799c96489eb0a +LINUX_KERNEL_HASH-4.14.101 = 142ff7c51b001c66e9be134fcec2722f9a47b89879a18e6f65b09b4585cdb69a LINUX_KERNEL_HASH-4.19.21 = db08ede726fe410da274e1e98f0de2aed9ff4b0e0b63a89e5928bef46998bbc1 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch index 90bb6426e4..a5a5f8b29a 100644 --- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch @@ -263,7 +263,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> int bond_set_carrier(struct bonding *bond); --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c -@@ -872,7 +872,8 @@ free_bat_counters: +@@ -874,7 +874,8 @@ free_bat_counters: * Return: 0 if successful or error otherwise. */ static int batadv_softif_slave_add(struct net_device *dev, |