diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-22 12:36:54 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-22 12:40:19 +0100 |
commit | 3a1978bbb412320c087ff506d49c7cd23dd60d60 (patch) | |
tree | b2f6d03e8669b8dc4a9d126fb32aee767e12657a /target/linux/generic | |
parent | 02e16e9e82c342bcee243b00fb6f9a059eef8034 (diff) | |
download | upstream-3a1978bbb412320c087ff506d49c7cd23dd60d60.tar.gz upstream-3a1978bbb412320c087ff506d49c7cd23dd60d60.tar.bz2 upstream-3a1978bbb412320c087ff506d49c7cd23dd60d60.zip |
kernel: bump 3.18 to 3.18.126
Refreshed all patches.
Compile-tested: adm5120
Runtime-tested: none
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic')
-rw-r--r-- | target/linux/generic/pending-3.18/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch | 2 | ||||
-rw-r--r-- | target/linux/generic/pending-3.18/530-jffs2_make_lzma_available.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-3.18/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch b/target/linux/generic/pending-3.18/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch index a69d197e62..3a09572bde 100644 --- a/target/linux/generic/pending-3.18/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch +++ b/target/linux/generic/pending-3.18/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch @@ -210,7 +210,7 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> /* * The generic kexec code builds a page list with physical -@@ -98,15 +210,16 @@ machine_kexec(struct kimage *image) +@@ -101,15 +213,16 @@ machine_kexec(struct kimage *image) /* * we do not want to be bothered. */ diff --git a/target/linux/generic/pending-3.18/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-3.18/530-jffs2_make_lzma_available.patch index c92209a72c..0cc8db9dca 100644 --- a/target/linux/generic/pending-3.18/530-jffs2_make_lzma_available.patch +++ b/target/linux/generic/pending-3.18/530-jffs2_make_lzma_available.patch @@ -206,7 +206,7 @@ +} --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c -@@ -375,14 +375,41 @@ static int __init init_jffs2_fs(void) +@@ -373,14 +373,41 @@ static int __init init_jffs2_fs(void) BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68); BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32); |