diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-05-08 21:53:27 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-05-08 21:53:27 +0000 |
| commit | a49ef16272783155eaf6408878013831a430c23a (patch) | |
| tree | a6019790b2f8cd692a4eada79d9a8ec62c12a62e | |
| parent | 6ae22784633b520cde43aa73ec2b46ff872a8a5e (diff) | |
| download | upstream-a49ef16272783155eaf6408878013831a430c23a.tar.gz upstream-a49ef16272783155eaf6408878013831a430c23a.tar.bz2 upstream-a49ef16272783155eaf6408878013831a430c23a.zip | |
kernel: update to kernel 3.14.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 40736
| -rw-r--r-- | include/kernel-version.mk | 4 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.14/100-overlayfs.patch | 2 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.14/204-module_strip.patch | 2 | ||||
| -rw-r--r-- | target/linux/x86_64/Makefile | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 44a7f11bdc..50fcfcb2ba 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -26,8 +26,8 @@ endif ifeq ($(LINUX_VERSION),3.13.7) LINUX_KERNEL_MD5SUM:=370adced5e5c1cb1d0d621c2dae2723f endif -ifeq ($(LINUX_VERSION),3.14) - LINUX_KERNEL_MD5SUM:=b621207b3f6ecbb67db18b13258f8ea8 +ifeq ($(LINUX_VERSION),3.14.3) + LINUX_KERNEL_MD5SUM:=99043433ad7368d2471b4743c9f562a2 endif # disable the md5sum check for unknown kernel versions diff --git a/target/linux/generic/patches-3.14/100-overlayfs.patch b/target/linux/generic/patches-3.14/100-overlayfs.patch index 9007c96deb..218b5c81d7 100644 --- a/target/linux/generic/patches-3.14/100-overlayfs.patch +++ b/target/linux/generic/patches-3.14/100-overlayfs.patch @@ -3219,7 +3219,7 @@ file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping); --- a/include/linux/mount.h +++ b/include/linux/mount.h -@@ -71,6 +71,9 @@ extern void mnt_pin(struct vfsmount *mnt +@@ -74,6 +74,9 @@ extern void mnt_pin(struct vfsmount *mnt extern void mnt_unpin(struct vfsmount *mnt); extern int __mnt_is_readonly(struct vfsmount *mnt); diff --git a/target/linux/generic/patches-3.14/204-module_strip.patch b/target/linux/generic/patches-3.14/204-module_strip.patch index 6d9aabf5cc..6790ac041f 100644 --- a/target/linux/generic/patches-3.14/204-module_strip.patch +++ b/target/linux/generic/patches-3.14/204-module_strip.patch @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> --- a/init/Kconfig +++ b/init/Kconfig -@@ -1823,6 +1823,13 @@ config MODULE_SIG_HASH +@@ -1830,6 +1830,13 @@ config MODULE_SIG_HASH default "sha384" if MODULE_SIG_SHA384 default "sha512" if MODULE_SIG_SHA512 diff --git a/target/linux/x86_64/Makefile b/target/linux/x86_64/Makefile index 085ba6805e..43326b2185 100644 --- a/target/linux/x86_64/Makefile +++ b/target/linux/x86_64/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=x86_64 FEATURES:=ext4 vdi vmdk targz MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.14 +LINUX_VERSION:=3.14.3 KERNELNAME:=bzImage |