aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-05-05 14:56:57 +0000
committerLuka Perkov <luka@openwrt.org>2016-06-19 19:22:56 +0200
commit4d74bf39ae0b3a29711df3228748ab860e7cdd3a (patch)
tree65739b90ee34d6c26742888e273786c70c6499fa /target/linux/generic
parentdbd05b03205fb3405adbe32031fb7c99a7af02a8 (diff)
downloadmaster-187ad058-4d74bf39ae0b3a29711df3228748ab860e7cdd3a.tar.gz
master-187ad058-4d74bf39ae0b3a29711df3228748ab860e7cdd3a.tar.bz2
master-187ad058-4d74bf39ae0b3a29711df3228748ab860e7cdd3a.zip
kernel: update kernel 4.1 to version 4.1.23
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49296 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-4.1/040-fs-overlay-fix-stacking.patch2
-rw-r--r--target/linux/generic/patches-4.1/111-jffs2-add-RENAME_EXCHANGE-support.patch2
-rw-r--r--target/linux/generic/patches-4.1/204-module_strip.patch4
-rw-r--r--target/linux/generic/patches-4.1/300-mips_expose_boot_raw.patch2
-rw-r--r--target/linux/generic/patches-4.1/304-mips_disable_fpu.patch2
-rw-r--r--target/linux/generic/patches-4.1/903-debloat_direct_io.patch4
6 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/patches-4.1/040-fs-overlay-fix-stacking.patch b/target/linux/generic/patches-4.1/040-fs-overlay-fix-stacking.patch
index 6c13e5ff41..bc54141342 100644
--- a/target/linux/generic/patches-4.1/040-fs-overlay-fix-stacking.patch
+++ b/target/linux/generic/patches-4.1/040-fs-overlay-fix-stacking.patch
@@ -21,7 +21,7 @@ Cc: <stable@vger.kernel.org> # v4.2+
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
-@@ -375,6 +375,9 @@ struct inode *ovl_d_select_inode(struct
+@@ -377,6 +377,9 @@ struct inode *ovl_d_select_inode(struct
ovl_path_upper(dentry, &realpath);
}
diff --git a/target/linux/generic/patches-4.1/111-jffs2-add-RENAME_EXCHANGE-support.patch b/target/linux/generic/patches-4.1/111-jffs2-add-RENAME_EXCHANGE-support.patch
index 3cc7b90f29..625f2181ab 100644
--- a/target/linux/generic/patches-4.1/111-jffs2-add-RENAME_EXCHANGE-support.patch
+++ b/target/linux/generic/patches-4.1/111-jffs2-add-RENAME_EXCHANGE-support.patch
@@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
else
/* Unlink the original */
ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
-@@ -879,7 +885,7 @@ static int jffs2_rename (struct inode *o
+@@ -884,7 +890,7 @@ static int jffs2_rename (struct inode *o
return ret;
}
diff --git a/target/linux/generic/patches-4.1/204-module_strip.patch b/target/linux/generic/patches-4.1/204-module_strip.patch
index ab2fd17c2b..220e8dcebe 100644
--- a/target/linux/generic/patches-4.1/204-module_strip.patch
+++ b/target/linux/generic/patches-4.1/204-module_strip.patch
@@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
config INIT_ALL_POSSIBLE
--- a/kernel/module.c
+++ b/kernel/module.c
-@@ -2685,6 +2685,7 @@ static struct module *setup_load_info(st
+@@ -2704,6 +2704,7 @@ static struct module *setup_load_info(st
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
{
@@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
const char *modmagic = get_modinfo(info, "vermagic");
int err;
-@@ -2710,6 +2711,7 @@ static int check_modinfo(struct module *
+@@ -2729,6 +2730,7 @@ static int check_modinfo(struct module *
pr_warn("%s: module is from the staging directory, the quality "
"is unknown, you have been warned.\n", mod->name);
}
diff --git a/target/linux/generic/patches-4.1/300-mips_expose_boot_raw.patch b/target/linux/generic/patches-4.1/300-mips_expose_boot_raw.patch
index 49f2ded56c..b9cf5ba25a 100644
--- a/target/linux/generic/patches-4.1/300-mips_expose_boot_raw.patch
+++ b/target/linux/generic/patches-4.1/300-mips_expose_boot_raw.patch
@@ -18,7 +18,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480
bool
-@@ -2676,6 +2673,18 @@ config USE_OF
+@@ -2677,6 +2674,18 @@ config USE_OF
config BUILTIN_DTB
bool
diff --git a/target/linux/generic/patches-4.1/304-mips_disable_fpu.patch b/target/linux/generic/patches-4.1/304-mips_disable_fpu.patch
index 7dc2ac9a2d..b65d258329 100644
--- a/target/linux/generic/patches-4.1/304-mips_disable_fpu.patch
+++ b/target/linux/generic/patches-4.1/304-mips_disable_fpu.patch
@@ -26,7 +26,7 @@ v2: incorporated changes suggested by Jonas Gorski
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -2668,6 +2668,20 @@ config MIPS_O32_FP64_SUPPORT
+@@ -2669,6 +2669,20 @@ config MIPS_O32_FP64_SUPPORT
If unsure, say N.
diff --git a/target/linux/generic/patches-4.1/903-debloat_direct_io.patch b/target/linux/generic/patches-4.1/903-debloat_direct_io.patch
index ca35e57619..92e36f0bb1 100644
--- a/target/linux/generic/patches-4.1/903-debloat_direct_io.patch
+++ b/target/linux/generic/patches-4.1/903-debloat_direct_io.patch
@@ -26,7 +26,7 @@
endif
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -2657,6 +2657,7 @@ enum {
+@@ -2659,6 +2659,7 @@ enum {
DIO_SKIP_DIO_COUNT = 0x08,
};
@@ -34,7 +34,7 @@
void dio_end_io(struct bio *bio, int error);
ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
-@@ -2664,6 +2665,18 @@ ssize_t __blockdev_direct_IO(struct kioc
+@@ -2666,6 +2667,18 @@ ssize_t __blockdev_direct_IO(struct kioc
loff_t offset, get_block_t get_block,
dio_iodone_t end_io, dio_submit_t submit_io,
int flags);