diff options
author | Stijn Tintel <stijn@linux-ipv6.be> | 2018-02-17 22:59:07 +0100 |
---|---|---|
committer | Stijn Tintel <stijn@linux-ipv6.be> | 2018-02-18 02:59:48 +0100 |
commit | 88ba41453dbc65e1d5d596073d66bdf2e59a43a1 (patch) | |
tree | 85b3d54e44612581df2482905a93ab53cae2acce /target/linux/generic/pending-4.14/491-ubi-auto-create-ubiblock-device-for-rootfs.patch | |
parent | 6c2e1ff80f52b939405fe0c14577c584602ae432 (diff) | |
download | upstream-88ba41453dbc65e1d5d596073d66bdf2e59a43a1.tar.gz upstream-88ba41453dbc65e1d5d596073d66bdf2e59a43a1.tar.bz2 upstream-88ba41453dbc65e1d5d596073d66bdf2e59a43a1.zip |
kernel: bump 4.14 to 4.14.20
Refresh patches.
Remove upstreamed patches:
- backport/080-v4.15-0001-arch-define-weak-abort.patch
- backport/081-v4.15-0002-kernel-exit.c-export-abort-to-modules.patch
Update patch that no longer applies:
pending/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch
Fixes CVE-2017-8824.
Compile-tested: octeon, x86/64.
Runtime-tested: octeon, x86/64.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/generic/pending-4.14/491-ubi-auto-create-ubiblock-device-for-rootfs.patch')
-rw-r--r-- | target/linux/generic/pending-4.14/491-ubi-auto-create-ubiblock-device-for-rootfs.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.14/491-ubi-auto-create-ubiblock-device-for-rootfs.patch b/target/linux/generic/pending-4.14/491-ubi-auto-create-ubiblock-device-for-rootfs.patch index f8dc1bcb28..cb2d525610 100644 --- a/target/linux/generic/pending-4.14/491-ubi-auto-create-ubiblock-device-for-rootfs.patch +++ b/target/linux/generic/pending-4.14/491-ubi-auto-create-ubiblock-device-for-rootfs.patch @@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- a/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c -@@ -625,6 +625,44 @@ static void __init ubiblock_create_from_ +@@ -633,6 +633,44 @@ static void __init ubiblock_create_from_ } } @@ -53,7 +53,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> static void ubiblock_remove_all(void) { struct ubiblock *next; -@@ -655,6 +693,10 @@ int __init ubiblock_init(void) +@@ -665,6 +703,10 @@ int __init ubiblock_init(void) */ ubiblock_create_from_param(); |