aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/config-3.144
-rw-r--r--target/linux/generic/patches-3.14/100-overlayfs.patch18
-rw-r--r--target/linux/generic/patches-3.14/204-module_strip.patch10
-rw-r--r--target/linux/generic/patches-3.14/300-mips_expose_boot_raw.patch2
-rw-r--r--target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch2
-rw-r--r--target/linux/generic/patches-3.14/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch2
-rw-r--r--target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch8
-rw-r--r--target/linux/generic/patches-3.14/664-codel_fix_3_12.patch2
-rw-r--r--target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch2
-rw-r--r--target/linux/generic/patches-3.14/863-gpiommc.patch2
-rw-r--r--target/linux/generic/patches-3.14/902-debloat_proc.patch2
-rw-r--r--target/linux/generic/patches-3.14/903-debloat_direct_io.patch2
12 files changed, 30 insertions, 26 deletions
diff --git a/target/linux/generic/config-3.14 b/target/linux/generic/config-3.14
index ef9bd6938f..5f652b3989 100644
--- a/target/linux/generic/config-3.14
+++ b/target/linux/generic/config-3.14
@@ -16,6 +16,7 @@ CONFIG_32BIT=y
# CONFIG_ACPI_HED is not set
# CONFIG_ACPI_POWER_METER is not set
# CONFIG_ACPI_QUICKSTART is not set
+# CONFIG_ACPI_INT3403_THERMAL is not set
# CONFIG_AD2S1200 is not set
# CONFIG_AD2S1210 is not set
# CONFIG_AD2S90 is not set
@@ -1059,6 +1060,7 @@ CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_IRQ_PROBE=y
# CONFIG_GENERIC_PHY is not set
CONFIG_GENERIC_TIME=y
+# CONFIG_GENWQE is not set
# CONFIG_GFS2_FS is not set
# CONFIG_GIGASET_CAPI is not set
# CONFIG_GIGASET_DEBUG is not set
@@ -1209,6 +1211,7 @@ CONFIG_HPET_MMAP_DEFAULT=y
# CONFIG_HPLAN is not set
# CONFIG_HPLAN_PLUS is not set
# CONFIG_HP_ILO is not set
+# CONFIG_HP_WIRELESS is not set
# CONFIG_HSI is not set
# CONFIG_HSR is not set
# CONFIG_HTC_EGPIO is not set
@@ -1307,6 +1310,7 @@ CONFIG_HZ_100=y
# CONFIG_I2C_XILINX is not set
# CONFIG_I2O is not set
# CONFIG_I40E is not set
+# CONFIG_I40EVF is not set
# CONFIG_I6300ESB_WDT is not set
# CONFIG_I82092 is not set
# CONFIG_I82365 is not set
diff --git a/target/linux/generic/patches-3.14/100-overlayfs.patch b/target/linux/generic/patches-3.14/100-overlayfs.patch
index 01284b140c..5a7150db86 100644
--- a/target/linux/generic/patches-3.14/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.14/100-overlayfs.patch
@@ -243,7 +243,7 @@
will be called when part or all of the page is to be removed
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -6437,6 +6437,13 @@ F: drivers/scsi/osd/
+@@ -6451,6 +6451,13 @@ F: drivers/scsi/osd/
F: include/scsi/osd_*
F: fs/exofs/
@@ -380,7 +380,7 @@
{
--- a/fs/open.c
+++ b/fs/open.c
-@@ -830,8 +830,7 @@ struct file *dentry_open(const struct pa
+@@ -834,8 +834,7 @@ struct file *dentry_open(const struct pa
f = get_empty_filp();
if (!IS_ERR(f)) {
f->f_flags = flags;
@@ -390,7 +390,7 @@
if (!error) {
/* from now on we need fput() to dispose of f */
error = open_check_o_direct(f);
-@@ -848,6 +847,26 @@ struct file *dentry_open(const struct pa
+@@ -852,6 +851,26 @@ struct file *dentry_open(const struct pa
}
EXPORT_SYMBOL(dentry_open);
@@ -3158,7 +3158,7 @@
struct pipe_inode_info *opipe,
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -246,6 +246,12 @@ struct iattr {
+@@ -249,6 +249,12 @@ struct iattr {
*/
#include <linux/quota.h>
@@ -3171,7 +3171,7 @@
/**
* enum positive_aop_returns - aop return codes with specific semantics
*
-@@ -1325,6 +1331,11 @@ struct super_block {
+@@ -1329,6 +1335,11 @@ struct super_block {
struct list_lru s_dentry_lru ____cacheline_aligned_in_smp;
struct list_lru s_inode_lru ____cacheline_aligned_in_smp;
struct rcu_head rcu;
@@ -3183,7 +3183,7 @@
};
extern struct timespec current_fs_time(struct super_block *sb);
-@@ -1581,6 +1592,7 @@ struct inode_operations {
+@@ -1585,6 +1596,7 @@ struct inode_operations {
umode_t create_mode, int *opened);
int (*tmpfile) (struct inode *, struct dentry *, umode_t);
int (*set_acl)(struct inode *, struct posix_acl *, int);
@@ -3191,7 +3191,7 @@
} ____cacheline_aligned;
ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
-@@ -2075,6 +2087,7 @@ extern struct file *file_open_name(struc
+@@ -2079,6 +2091,7 @@ extern struct file *file_open_name(struc
extern struct file *filp_open(const char *, int, umode_t);
extern struct file *file_open_root(struct dentry *, struct vfsmount *,
const char *, int);
@@ -3199,7 +3199,7 @@
extern struct file * dentry_open(const struct path *, int, const struct cred *);
extern int filp_close(struct file *, fl_owner_t id);
-@@ -2288,6 +2301,7 @@ extern sector_t bmap(struct inode *, sec
+@@ -2292,6 +2305,7 @@ extern sector_t bmap(struct inode *, sec
#endif
extern int notify_change(struct dentry *, struct iattr *, struct inode **);
extern int inode_permission(struct inode *, int);
@@ -3207,7 +3207,7 @@
extern int generic_permission(struct inode *, int);
static inline bool execute_ok(struct inode *inode)
-@@ -2496,6 +2510,9 @@ extern ssize_t generic_file_splice_write
+@@ -2500,6 +2514,9 @@ extern ssize_t generic_file_splice_write
struct file *, loff_t *, size_t, unsigned int);
extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe,
struct file *out, loff_t *, size_t len, unsigned int flags);
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 c182c69622..6d9aabf5cc 100644
--- a/target/linux/generic/patches-3.14/204-module_strip.patch
+++ b/target/linux/generic/patches-3.14/204-module_strip.patch
@@ -133,7 +133,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
set_license(mod, get_modinfo(info, "license"));
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
-@@ -1721,7 +1721,9 @@ static void read_symbols(char *modname)
+@@ -1734,7 +1734,9 @@ static void read_symbols(char *modname)
symname = info.strtab + sym->st_name;
handle_modversions(mod, &info, sym, symname);
@@ -143,7 +143,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
}
if (!is_vmlinux(modname) ||
(is_vmlinux(modname) && vmlinux_section_warnings))
-@@ -1865,7 +1867,9 @@ static void add_header(struct buffer *b,
+@@ -1878,7 +1880,9 @@ static void add_header(struct buffer *b,
buf_printf(b, "#include <linux/vermagic.h>\n");
buf_printf(b, "#include <linux/compiler.h>\n");
buf_printf(b, "\n");
@@ -153,7 +153,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
buf_printf(b, "\n");
buf_printf(b, "__visible struct module __this_module\n");
buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
-@@ -1882,16 +1886,20 @@ static void add_header(struct buffer *b,
+@@ -1895,16 +1899,20 @@ static void add_header(struct buffer *b,
static void add_intree_flag(struct buffer *b, int is_intree)
{
@@ -174,7 +174,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
}
/**
-@@ -1984,11 +1992,13 @@ static void add_depends(struct buffer *b
+@@ -1997,11 +2005,13 @@ static void add_depends(struct buffer *b
static void add_srcversion(struct buffer *b, struct module *mod)
{
@@ -188,7 +188,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
}
static void write_if_changed(struct buffer *b, const char *fname)
-@@ -2217,7 +2227,9 @@ int main(int argc, char **argv)
+@@ -2230,7 +2240,9 @@ int main(int argc, char **argv)
add_staging_flag(&buf, mod->name);
err |= add_versions(&buf, mod);
add_depends(&buf, mod, modules);
diff --git a/target/linux/generic/patches-3.14/300-mips_expose_boot_raw.patch b/target/linux/generic/patches-3.14/300-mips_expose_boot_raw.patch
index 146437b9e9..4b4ac951a1 100644
--- a/target/linux/generic/patches-3.14/300-mips_expose_boot_raw.patch
+++ b/target/linux/generic/patches-3.14/300-mips_expose_boot_raw.patch
@@ -18,7 +18,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480
bool
-@@ -2378,6 +2375,18 @@ config USE_OF
+@@ -2384,6 +2381,18 @@ config USE_OF
select OF_EARLY_FLATTREE
select IRQ_DOMAIN
diff --git a/target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch
index f6b1be0f98..eec90fa413 100644
--- a/target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch
+++ b/target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch
@@ -30,7 +30,7 @@
/****************************************************************************/
enum read_type {
-@@ -1195,7 +1201,7 @@ static int m25p_probe(struct spi_device
+@@ -1192,7 +1198,7 @@ static int m25p_probe(struct spi_device
flash->mtd._write = m25p80_write;
/* prefer "small sector" erase if possible */
diff --git a/target/linux/generic/patches-3.14/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch b/target/linux/generic/patches-3.14/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
index 2a79d904e7..d4c6a64115 100644
--- a/target/linux/generic/patches-3.14/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
+++ b/target/linux/generic/patches-3.14/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -1025,6 +1025,7 @@ static const struct spi_device_id m25p_i
+@@ -1022,6 +1022,7 @@ static const struct spi_device_id m25p_i
{ "m25px64", INFO(0x207117, 0, 64 * 1024, 128, 0) },
/* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
diff --git a/target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch
index 5cf3febd56..2d807431d6 100644
--- a/target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch
+++ b/target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch
@@ -32,7 +32,7 @@
+obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
-@@ -1304,7 +1304,7 @@ out:
+@@ -1307,7 +1307,7 @@ out:
return ret;
}
@@ -41,7 +41,7 @@
const struct in6_addr *daddr, unsigned int prefs,
struct in6_addr *saddr)
{
-@@ -1429,7 +1429,6 @@ try_nextdev:
+@@ -1432,7 +1432,6 @@ try_nextdev:
in6_ifa_put(hiscore->ifa);
return 0;
}
@@ -49,7 +49,7 @@
int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
u32 banned_flags)
-@@ -5294,6 +5293,9 @@ int __init addrconf_init(void)
+@@ -5297,6 +5296,9 @@ int __init addrconf_init(void)
ipv6_addr_label_rtnl_register();
@@ -59,7 +59,7 @@
return 0;
errout:
rtnl_af_unregister(&inet6_ops);
-@@ -5311,6 +5313,9 @@ void addrconf_cleanup(void)
+@@ -5314,6 +5316,9 @@ void addrconf_cleanup(void)
struct net_device *dev;
int i;
diff --git a/target/linux/generic/patches-3.14/664-codel_fix_3_12.patch b/target/linux/generic/patches-3.14/664-codel_fix_3_12.patch
index 392bc91c48..31158c5848 100644
--- a/target/linux/generic/patches-3.14/664-codel_fix_3_12.patch
+++ b/target/linux/generic/patches-3.14/664-codel_fix_3_12.patch
@@ -1,6 +1,6 @@
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
-@@ -1913,7 +1913,7 @@ static int __init pktsched_init(void)
+@@ -1914,7 +1914,7 @@ static int __init pktsched_init(void)
return err;
}
diff --git a/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch
index 3137ba9a5c..9d6da7b185 100644
--- a/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch
+++ b/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch
@@ -21,7 +21,7 @@
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
-@@ -882,6 +882,9 @@ int genphy_update_link(struct phy_device
+@@ -881,6 +881,9 @@ int genphy_update_link(struct phy_device
{
int status;
diff --git a/target/linux/generic/patches-3.14/863-gpiommc.patch b/target/linux/generic/patches-3.14/863-gpiommc.patch
index c260234b31..8f3022c837 100644
--- a/target/linux/generic/patches-3.14/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.14/863-gpiommc.patch
@@ -830,7 +830,7 @@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3931,6 +3931,11 @@ L: linuxppc-dev@lists.ozlabs.org
+@@ -3935,6 +3935,11 @@ L: linuxppc-dev@lists.ozlabs.org
S: Odd Fixes
F: drivers/tty/hvc/
diff --git a/target/linux/generic/patches-3.14/902-debloat_proc.patch b/target/linux/generic/patches-3.14/902-debloat_proc.patch
index 68ca0c2790..8306a0b0d1 100644
--- a/target/linux/generic/patches-3.14/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.14/902-debloat_proc.patch
@@ -173,7 +173,7 @@
goto err;
--- a/net/core/sock.c
+++ b/net/core/sock.c
-@@ -2933,6 +2933,8 @@ static __net_initdata struct pernet_oper
+@@ -2936,6 +2936,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{
diff --git a/target/linux/generic/patches-3.14/903-debloat_direct_io.patch b/target/linux/generic/patches-3.14/903-debloat_direct_io.patch
index 3aaa1b3314..06fcdb0338 100644
--- a/target/linux/generic/patches-3.14/903-debloat_direct_io.patch
+++ b/target/linux/generic/patches-3.14/903-debloat_direct_io.patch
@@ -26,7 +26,7 @@
endif
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -2553,12 +2553,26 @@ enum {
+@@ -2557,12 +2557,26 @@ enum {
DIO_SKIP_HOLES = 0x02,
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 15:06:28 +0000