Changeset 39789


Ignore:
Timestamp:
2014-03-07T12:27:00+01:00 (4 years ago)
Author:
kaloz
Message:

add preliminary 3.14 support

Signed-off-by: Imre Kaloz <kaloz@…>

Location:
trunk/target/linux/generic
Files:
4 deleted
64 edited
2 copied

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/config-3.14

    r39634 r39789  
    120120# CONFIG_ARCH_BCM2835 is not set 
    121121# CONFIG_ARCH_BCMRING is not set 
     122# CONFIG_ARCH_BERLIN is not set 
    122123# CONFIG_ARCH_CLPS711X is not set 
    123124# CONFIG_ARCH_CNS3XXX is not set 
     
    134135# CONFIG_ARCH_HAS_ILOG2_U32 is not set 
    135136# CONFIG_ARCH_HAS_ILOG2_U64 is not set 
     137# CONFIG_ARCH_HI3xxx is not set 
    136138# CONFIG_ARCH_HIGHBANK is not set 
    137139# CONFIG_ARCH_INTEGRATOR is not set 
     
    147149# CONFIG_ARCH_LPC32XX is not set 
    148150# CONFIG_ARCH_MMP is not set 
    149 # CONFIG_ARCH_MSM is not set 
     151# CONFIG_ARCH_MSM_DT is not set 
     152# CONFIG_ARCH_MSM_NODT is not set 
    150153# CONFIG_ARCH_MULTIPLATFORM is not set 
    151154# CONFIG_ARCH_MULTI_V6 is not set 
     
    180183# CONFIG_ARCH_SHARK is not set 
    181184# CONFIG_ARCH_SHMOBILE is not set 
     185# CONFIG_ARCH_SHMOBILE_LEGACY is not set 
    182186# CONFIG_ARCH_SHMOBILE_MULTI is not set 
    183187# CONFIG_ARCH_SIRF is not set 
     
    225229# CONFIG_ARM_PATCH_PHYS_VIRT is not set 
    226230# CONFIG_ARM_PSCI is not set 
     231# CONFIG_ARM_PTDUMP is not set 
    227232# CONFIG_ARM_UNWIND is not set 
    228233# CONFIG_ARM_VIRT_EXT is not set 
     
    331336# CONFIG_BCMA_DRIVER_GPIO is not set 
    332337CONFIG_BCMA_POSSIBLE=y 
     338# CONFIG_BCM_KONA_USB2_PHY is not set 
    333339# CONFIG_BCM_WIMAX is not set 
    334340# CONFIG_BDI_SWITCH is not set 
     
    447453CONFIG_BRANCH_PROFILE_NONE=y 
    448454# CONFIG_BRCMFMAC is not set 
     455# CONFIG_BRCMSMAC is not set 
    449456CONFIG_BRIDGE=y 
    450457# CONFIG_BRIDGE_EBT_802_3 is not set 
     
    532539# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 
    533540# CONFIG_CC_STACKPROTECTOR is not set 
     541CONFIG_CC_STACKPROTECTOR_NONE=y 
     542# CONFIG_CC_STACKPROTECTOR_REGULAR is not set 
     543# CONFIG_CC_STACKPROTECTOR_STRONG is not set 
    534544# CONFIG_CDROM_PKTCDVD is not set 
    535545# CONFIG_CED1401 is not set 
     
    549559# CONFIG_CHARGER_MAX8903 is not set 
    550560# CONFIG_CHARGER_SMB347 is not set 
     561# CONFIG_CHARGER_TWL4030 is not set 
    551562# CONFIG_CHECKPOINT_RESTORE is not set 
    552563# CONFIG_CHELSIO_T1 is not set 
     
    586597# CONFIG_COMEDI is not set 
    587598# CONFIG_COMMON_CLK_DEBUG is not set 
     599# CONFIG_COMMON_CLK_QCOM is not set 
    588600# CONFIG_COMMON_CLK_SI5351 is not set 
     601# CONFIG_COMMON_CLK_SI570 is not set 
    589602# CONFIG_COMPACTION is not set 
    590603# CONFIG_COMPAL_LAPTOP is not set 
     
    955968# CONFIG_FB_NVIDIA is not set 
    956969# CONFIG_FB_OF is not set 
     970# CONFIG_FB_OPENCORES is not set 
    957971# CONFIG_FB_PM2 is not set 
    958972# CONFIG_FB_PM3 is not set 
     
    10751089# CONFIG_GPIO_RDC321X is not set 
    10761090# CONFIG_GPIO_SCH is not set 
     1091# CONFIG_GPIO_SCH311X is not set 
    10771092# CONFIG_GPIO_SX150X is not set 
    10781093# CONFIG_GPIO_SYSFS is not set 
    10791094# CONFIG_GPIO_TS5500 is not set 
    10801095# CONFIG_GPIO_VX855 is not set 
     1096# CONFIG_GPIO_WATCHDOG is not set 
    10811097# CONFIG_GPIO_WDT is not set 
    10821098# CONFIG_GPIO_XILINX is not set 
     
    14001416# CONFIG_INPUT_FF_MEMLESS is not set 
    14011417# CONFIG_INPUT_GP2A is not set 
     1418# CONFIG_INPUT_GPIO_BEEPER is not set 
    14021419# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set 
    14031420# CONFIG_INPUT_GPIO_TILT_POLLED is not set 
     
    18241841# CONFIG_MFD_KEMPLD is not set 
    18251842# CONFIG_MFD_LM3533 is not set 
     1843# CONFIG_MFD_LP3943 is not set 
    18261844# CONFIG_MFD_LP8788 is not set 
     1845# CONFIG_MFD_MAX14577 is not set 
    18271846# CONFIG_MFD_MAX77686 is not set 
    18281847# CONFIG_MFD_MAX77693 is not set 
     
    21322151# CONFIG_NETFILTER_XT_MATCH_HELPER is not set 
    21332152# CONFIG_NETFILTER_XT_MATCH_HL is not set 
     2153# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set 
    21342154# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set 
     2155# CONFIG_NETFILTER_XT_MATCH_L2TP is not set 
    21352156# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set 
    21362157# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set 
     
    22632284# CONFIG_NET_SCH_GRED is not set 
    22642285# CONFIG_NET_SCH_HFSC is not set 
     2286# CONFIG_NET_SCH_HHF is not set 
    22652287# CONFIG_NET_SCH_HTB is not set 
    22662288# CONFIG_NET_SCH_INGRESS is not set 
     
    22682290# CONFIG_NET_SCH_MULTIQ is not set 
    22692291# CONFIG_NET_SCH_NETEM is not set 
     2292# CONFIG_NET_SCH_PIE is not set 
    22702293# CONFIG_NET_SCH_PLUG is not set 
    22712294# CONFIG_NET_SCH_PRIO is not set 
     
    25082531# CONFIG_PANIC_ON_OOPS is not set 
    25092532CONFIG_PANIC_ON_OOPS_VALUE=0 
     2533CONFIG_PANIC_TIMEOUT=0 
    25102534# CONFIG_PANTHERLORD_FF is not set 
    25112535# CONFIG_PARPORT is not set 
     
    26292653CONFIG_PINCONF=y 
    26302654# CONFIG_PINCTRL is not set 
     2655# CONFIG_PINCTRL_CAPRI is not set 
    26312656# CONFIG_PINCTRL_EXYNOS is not set 
    26322657# CONFIG_PINCTRL_EXYNOS5440 is not set 
     2658# CONFIG_PINCTRL_MSM8X74 is not set 
    26332659CONFIG_PINCTRL_SINGLE=y 
    26342660CONFIG_PINMUX=y 
     
    27732799# CONFIG_REGMAP_SPI is not set 
    27742800# CONFIG_REGULATOR is not set 
     2801# CONFIG_REGULATOR_ACT8865 is not set 
    27752802# CONFIG_REGULATOR_AD5398 is not set 
    27762803# CONFIG_REGULATOR_BQ24022 is not set 
     
    28352862# CONFIG_RTC_DRV_GENERIC is not set 
    28362863# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set 
     2864# CONFIG_RTC_DRV_HYM8563 is not set 
    28372865# CONFIG_RTC_DRV_ISL12022 is not set 
     2866# CONFIG_RTC_DRV_ISL12057 is not set 
    28382867# CONFIG_RTC_DRV_ISL1208 is not set 
    28392868# CONFIG_RTC_DRV_M41T80 is not set 
     
    35493578# CONFIG_TEST_KSTRTOX is not set 
    35503579# CONFIG_TEST_LIST_SORT is not set 
     3580# CONFIG_TEST_MODULE is not set 
    35513581# CONFIG_TEST_POWER is not set 
    35523582# CONFIG_TEST_STRING_HELPERS is not set 
     3583# CONFIG_TEST_USER_COPY is not set 
    35533584CONFIG_TEXTSEARCH=y 
    35543585# CONFIG_TEXTSEARCH_BM is not set 
  • trunk/target/linux/generic/patches-3.14/009-mtd_m25p80_add_support_for_esmt_f25l32pa.patch

    r39348 r39789  
    2626--- a/drivers/mtd/devices/m25p80.c 
    2727+++ b/drivers/mtd/devices/m25p80.c 
    28 @@ -750,6 +750,9 @@ static const struct spi_device_id m25p_i 
     28@@ -908,6 +908,9 @@ static const struct spi_device_id m25p_i 
    2929        /* ESMT */ 
    3030        { "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64, SECT_4K) }, 
  • trunk/target/linux/generic/patches-3.14/100-overlayfs.patch

    r39349 r39789  
    244244--- a/MAINTAINERS 
    245245+++ b/MAINTAINERS 
    246 @@ -6345,6 +6345,13 @@ F:       drivers/scsi/osd/ 
     246@@ -6437,6 +6437,13 @@ F:       drivers/scsi/osd/ 
    247247 F:     include/scsi/osd_* 
    248248 F:     fs/exofs/ 
     
    266266+source "fs/overlayfs/Kconfig" 
    267267  
    268  config GENERIC_ACL 
    269         bool 
     268 menu "Caches" 
     269  
    270270--- a/fs/Makefile 
    271271+++ b/fs/Makefile 
    272 @@ -105,6 +105,7 @@ obj-$(CONFIG_QNX6FS_FS)             += qnx6/ 
     272@@ -104,6 +104,7 @@ obj-$(CONFIG_QNX6FS_FS)             += qnx6/ 
    273273 obj-$(CONFIG_AUTOFS4_FS)       += autofs4/ 
    274274 obj-$(CONFIG_ADFS_FS)          += adfs/ 
     
    319319--- a/fs/namei.c 
    320320+++ b/fs/namei.c 
    321 @@ -402,6 +402,7 @@ int __inode_permission(struct inode *ino 
     321@@ -413,6 +413,7 @@ int __inode_permission(struct inode *ino 
    322322  
    323323        return security_inode_permission(inode, mask); 
     
    327327 /** 
    328328  * sb_permission - Check superblock-level permissions 
    329 @@ -3027,9 +3028,12 @@ finish_open_created: 
     329@@ -3038,9 +3039,12 @@ finish_open_created: 
    330330        error = may_open(&nd->path, acc_mode, open_flag); 
    331331        if (error) 
     
    31493149--- a/fs/splice.c 
    31503150+++ b/fs/splice.c 
    3151 @@ -1309,6 +1309,7 @@ long do_splice_direct(struct file *in, l 
     3151@@ -1327,6 +1327,7 @@ long do_splice_direct(struct file *in, l 
    31523152  
    31533153        return ret; 
     
    31843184  
    31853185 extern struct timespec current_fs_time(struct super_block *sb); 
    3186 @@ -1580,6 +1591,7 @@ struct inode_operations { 
    3187                            struct file *, unsigned open_flag, 
     3186@@ -1581,6 +1592,7 @@ struct inode_operations { 
    31883187                           umode_t create_mode, int *opened); 
    31893188        int (*tmpfile) (struct inode *, struct dentry *, umode_t); 
     3189        int (*set_acl)(struct inode *, struct posix_acl *, int); 
    31903190+       int (*dentry_open)(struct dentry *, struct file *, const struct cred *); 
    31913191 } ____cacheline_aligned; 
    31923192  
    31933193 ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, 
    3194 @@ -2074,6 +2086,7 @@ extern struct file *file_open_name(struc 
     3194@@ -2075,6 +2087,7 @@ extern struct file *file_open_name(struc 
    31953195 extern struct file *filp_open(const char *, int, umode_t); 
    31963196 extern struct file *file_open_root(struct dentry *, struct vfsmount *, 
     
    32003200 extern int filp_close(struct file *, fl_owner_t id); 
    32013201  
    3202 @@ -2280,6 +2293,7 @@ extern sector_t bmap(struct inode *, sec 
     3202@@ -2288,6 +2301,7 @@ extern sector_t bmap(struct inode *, sec 
    32033203 #endif 
    32043204 extern int notify_change(struct dentry *, struct iattr *, struct inode **); 
     
    32083208  
    32093209 static inline bool execute_ok(struct inode *inode) 
    3210 @@ -2488,6 +2502,9 @@ extern ssize_t generic_file_splice_write 
     3210@@ -2496,6 +2510,9 @@ extern ssize_t generic_file_splice_write 
    32113211                struct file *, loff_t *, size_t, unsigned int); 
    32123212 extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe, 
  • trunk/target/linux/generic/patches-3.14/102-ehci_hcd_ignore_oc.patch

    r39582 r39789  
    2121--- a/drivers/usb/host/ehci-hcd.c 
    2222+++ b/drivers/usb/host/ehci-hcd.c 
    23 @@ -634,7 +634,7 @@ static int ehci_run (struct usb_hcd *hcd 
     23@@ -633,7 +633,7 @@ static int ehci_run (struct usb_hcd *hcd 
    2424                "USB %x.%x started, EHCI %x.%02x%s\n", 
    2525                ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f), 
     
    3232--- a/drivers/usb/host/ehci-hub.c 
    3333+++ b/drivers/usb/host/ehci-hub.c 
    34 @@ -623,7 +623,7 @@ ehci_hub_status_data (struct usb_hcd *hc 
     34@@ -641,7 +641,7 @@ ehci_hub_status_data (struct usb_hcd *hc 
    3535         * always set, seem to clear PORT_OCC and PORT_CSC when writing to 
    3636         * PORT_POWER; that's surprising, but maybe within-spec. 
     
    4141        else 
    4242                mask = PORT_CSC | PORT_PEC; 
    43 @@ -983,7 +983,7 @@ static int ehci_hub_control ( 
     43@@ -1001,7 +1001,7 @@ static int ehci_hub_control ( 
    4444                if (temp & PORT_PEC) 
    4545                        status |= USB_PORT_STAT_C_ENABLE << 16; 
  • trunk/target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch

    r38528 r39789  
    2626-       br_vlan_get_tag(skb, &vid); 
    2727-       if (p->flags & BR_LEARNING) 
    28 -               br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid); 
     28-               br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false); 
    2929+               br_vlan_get_tag(skb, &vid); 
    3030+               if (p->flags & BR_LEARNING) 
    31 +                       br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid); 
     31+                       br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false); 
    3232+       } 
    3333        return 0;        /* process further */ 
  • trunk/target/linux/generic/patches-3.14/132-mips_inline_dma_ops.patch

    r39348 r39789  
    11--- a/arch/mips/Kconfig 
    22+++ b/arch/mips/Kconfig 
    3 @@ -1377,6 +1377,7 @@ config CPU_CAVIUM_OCTEON 
    4         select LIBFDT 
    5         select USE_OF 
    6         select USB_EHCI_BIG_ENDIAN_MMIO 
    7 +       select SYS_HAS_DMA_OPS 
    8         help 
    9           The Cavium Octeon processor is a highly integrated chip containing 
    10           many ethernet hardware widgets for networking tasks. The processor 
    11 @@ -1599,6 +1600,9 @@ config SYS_HAS_CPU_XLR 
     3@@ -1620,6 +1620,9 @@ config SYS_HAS_CPU_XLR 
    124 config SYS_HAS_CPU_XLP 
    135        bool 
  • trunk/target/linux/generic/patches-3.14/200-fix_localversion.patch

    r38528 r39789  
    11--- a/scripts/setlocalversion 
    22+++ b/scripts/setlocalversion 
    3 @@ -164,7 +164,7 @@ else 
     3@@ -165,7 +165,7 @@ else 
    44        # annotated or signed tagged state (as git describe only 
    55        # looks at signed or annotated tags - git tag -a/-s) and 
  • trunk/target/linux/generic/patches-3.14/201-extra_optimization.patch

    r39348 r39789  
    11--- a/Makefile 
    22+++ b/Makefile 
    3 @@ -574,9 +574,9 @@ endif # $(dot-config) 
     3@@ -580,9 +580,9 @@ endif # $(dot-config) 
    44 all: vmlinux 
    55  
  • trunk/target/linux/generic/patches-3.14/202-reduce_module_size.patch

    r39348 r39789  
    11--- a/Makefile 
    22+++ b/Makefile 
    3 @@ -382,7 +382,7 @@ KBUILD_CFLAGS_KERNEL := 
     3@@ -388,7 +388,7 @@ KBUILD_CFLAGS_KERNEL := 
    44 KBUILD_AFLAGS   := -D__ASSEMBLY__ 
    55 KBUILD_AFLAGS_MODULE  := -DMODULE 
  • trunk/target/linux/generic/patches-3.14/203-kallsyms_uncompressed.patch

    r39348 r39789  
    5252--- a/init/Kconfig 
    5353+++ b/init/Kconfig 
    54 @@ -1282,6 +1282,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW 
     54@@ -1270,6 +1270,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW 
    5555          the unaligned access emulation. 
    5656          see arch/parisc/kernel/unaligned.c for reference 
  • trunk/target/linux/generic/patches-3.14/204-module_strip.patch

    r39348 r39789  
    66--- a/include/linux/module.h 
    77+++ b/include/linux/module.h 
    8 @@ -83,7 +83,7 @@ void sort_extable(struct exception_table 
     8@@ -82,7 +82,7 @@ void sort_extable(struct exception_table 
    99 void sort_main_extable(void); 
    1010 void trim_init_extable(struct module *m); 
     
    1212-#ifdef MODULE 
    1313+#if defined(MODULE) && !defined(CONFIG_MODULE_STRIPPED) 
    14  #define MODULE_GENERIC_TABLE(gtype,name)                       \ 
     14 #define MODULE_GENERIC_TABLE(gtype, name)                      \ 
    1515 extern const struct gtype##_id __mod_##gtype##_table           \ 
    1616   __attribute__ ((unused, alias(__stringify(name)))) 
    17 @@ -94,9 +94,10 @@ extern const struct gtype##_id __mod_##g 
     17@@ -93,9 +93,10 @@ extern const struct gtype##_id __mod_##g 
    1818  
    1919 /* Generic info of form tag = "info" */ 
     
    2727 /* Soft module dependencies. See man modprobe.d for details. 
    2828  * Example: MODULE_SOFTDEP("pre: module-foo module-bar post: module-baz") 
    29 @@ -137,10 +138,10 @@ extern const struct gtype##_id __mod_##g 
     29@@ -136,10 +137,10 @@ extern const struct gtype##_id __mod_##g 
    3030  * Author(s), use "Name <email>" or just "Name", for multiple 
    3131  * authors use multiple MODULE_AUTHOR() statements/lines. 
     
    3333-#define MODULE_AUTHOR(_author) MODULE_INFO(author, _author) 
    3434+#define MODULE_AUTHOR(_author) MODULE_INFO_STRIP(author, _author) 
    35     
     35  
    3636 /* What your module does. */ 
    3737-#define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description) 
    3838+#define MODULE_DESCRIPTION(_description) MODULE_INFO_STRIP(description, _description) 
    3939  
    40  #define MODULE_DEVICE_TABLE(type,name)         \ 
    41    MODULE_GENERIC_TABLE(type##_device,name) 
    42 @@ -161,7 +162,9 @@ extern const struct gtype##_id __mod_##g 
    43  */ 
     40 #define MODULE_DEVICE_TABLE(type, name)                \ 
     41   MODULE_GENERIC_TABLE(type##_device, name) 
     42@@ -162,7 +163,9 @@ extern const struct gtype##_id __mod_##g 
     43  */ 
    4444  
    4545 #if defined(MODULE) || !defined(CONFIG_SYSFS) 
     
    5151 #define MODULE_VERSION(_version)                                       \ 
    5252        static struct module_version_attribute ___modver_attr = {       \ 
    53 @@ -183,7 +186,7 @@ extern const struct gtype##_id __mod_##g 
     53@@ -184,7 +187,7 @@ extern const struct gtype##_id __mod_##g 
    5454 /* Optional firmware file (or files) needed by the module 
    5555  * format is simply firmware file name.  Multiple firmware 
     
    100100--- a/init/Kconfig 
    101101+++ b/init/Kconfig 
    102 @@ -1835,6 +1835,13 @@ config MODULE_SIG_HASH 
     102@@ -1823,6 +1823,13 @@ config MODULE_SIG_HASH 
    103103        default "sha384" if MODULE_SIG_SHA384 
    104104        default "sha512" if MODULE_SIG_SHA512 
     
    116116--- a/kernel/module.c 
    117117+++ b/kernel/module.c 
    118 @@ -2666,6 +2666,7 @@ static struct module *setup_load_info(st 
     118@@ -2664,6 +2664,7 @@ static struct module *setup_load_info(st 
    119119  
    120120 static int check_modinfo(struct module *mod, struct load_info *info, int flags) 
     
    124124        int err; 
    125125  
    126 @@ -2691,6 +2692,7 @@ static int check_modinfo(struct module * 
     126@@ -2689,6 +2690,7 @@ static int check_modinfo(struct module * 
    127127                pr_warn("%s: module is from the staging directory, the quality " 
    128128                        "is unknown, you have been warned.\n", mod->name); 
     
    134134--- a/scripts/mod/modpost.c 
    135135+++ b/scripts/mod/modpost.c 
    136 @@ -1717,7 +1717,9 @@ static void read_symbols(char *modname) 
     136@@ -1721,7 +1721,9 @@ static void read_symbols(char *modname) 
    137137                symname = info.strtab + sym->st_name; 
    138138  
     
    144144        if (!is_vmlinux(modname) || 
    145145             (is_vmlinux(modname) && vmlinux_section_warnings)) 
    146 @@ -1861,7 +1863,9 @@ static void add_header(struct buffer *b, 
     146@@ -1865,7 +1867,9 @@ static void add_header(struct buffer *b, 
    147147        buf_printf(b, "#include <linux/vermagic.h>\n"); 
    148148        buf_printf(b, "#include <linux/compiler.h>\n"); 
     
    154154        buf_printf(b, "__visible struct module __this_module\n"); 
    155155        buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n"); 
    156 @@ -1878,16 +1882,20 @@ static void add_header(struct buffer *b, 
     156@@ -1882,16 +1886,20 @@ static void add_header(struct buffer *b, 
    157157  
    158158 static void add_intree_flag(struct buffer *b, int is_intree) 
     
    175175  
    176176 /** 
    177 @@ -1980,11 +1988,13 @@ static void add_depends(struct buffer *b 
     177@@ -1984,11 +1992,13 @@ static void add_depends(struct buffer *b 
    178178  
    179179 static void add_srcversion(struct buffer *b, struct module *mod) 
     
    189189  
    190190 static void write_if_changed(struct buffer *b, const char *fname) 
    191 @@ -2213,7 +2223,9 @@ int main(int argc, char **argv) 
     191@@ -2217,7 +2227,9 @@ int main(int argc, char **argv) 
    192192                add_staging_flag(&buf, mod->name); 
    193193                err |= add_versions(&buf, mod); 
  • trunk/target/linux/generic/patches-3.14/221-module_exports.patch

    r39348 r39789  
    8585+         __EXPORT_SUFFIX(sym)), aligned(1)))                   \ 
    8686        = VMLINUX_SYMBOL_STR(sym);                              \ 
     87        extern const struct kernel_symbol __ksymtab_##sym;      \ 
    8788        __visible const struct kernel_symbol __ksymtab_##sym    \ 
    88         __used                                                  \ 
  • trunk/target/linux/generic/patches-3.14/230-openwrt_lzma_options.patch

    r39348 r39789  
    11--- a/scripts/Makefile.lib 
    22+++ b/scripts/Makefile.lib 
    3 @@ -303,7 +303,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 
     3@@ -304,7 +304,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 
    44  
    55 quiet_cmd_lzma = LZMA    $@ 
  • trunk/target/linux/generic/patches-3.14/250-netfilter_depends.patch

    r39348 r39789  
    99        help 
    1010          H.323 is a VoIP signalling protocol from ITU-T. As one of the most 
    11 @@ -802,7 +801,6 @@ config NETFILTER_XT_TARGET_SECMARK 
     11@@ -871,7 +870,6 @@ config NETFILTER_XT_TARGET_SECMARK 
    1212  
    1313 config NETFILTER_XT_TARGET_TCPMSS 
  • trunk/target/linux/generic/patches-3.14/259-regmap_dynamic.patch

    r39348 r39789  
    6969 #include <linux/err.h> 
    7070 #include <linux/rbtree.h> 
    71 @@ -2235,3 +2236,5 @@ static int __init regmap_initcall(void) 
     71@@ -2247,3 +2248,5 @@ static int __init regmap_initcall(void) 
    7272        return 0; 
    7373 } 
  • trunk/target/linux/generic/patches-3.14/300-mips_expose_boot_raw.patch

    r39348 r39789  
    99--- a/arch/mips/Kconfig 
    1010+++ b/arch/mips/Kconfig 
    11 @@ -846,9 +846,6 @@ config FW_ARC 
     11@@ -852,9 +852,6 @@ config FW_ARC 
    1212 config ARCH_MAY_HAVE_PC_FDC 
    1313        bool 
     
    1919        bool 
    2020  
    21 @@ -2349,6 +2346,18 @@ config USE_OF 
     21@@ -2378,6 +2375,18 @@ config USE_OF 
    2222        select OF_EARLY_FLATTREE 
    2323        select IRQ_DOMAIN 
  • trunk/target/linux/generic/patches-3.14/301-mips_image_cmdline_hack.patch

    r39348 r39789  
    11--- a/arch/mips/Kconfig 
    22+++ b/arch/mips/Kconfig 
    3 @@ -940,6 +940,10 @@ config SYNC_R4K 
     3@@ -946,6 +946,10 @@ config SYNC_R4K 
    44 config MIPS_MACHINE 
    55        def_bool n 
  • trunk/target/linux/generic/patches-3.14/304-mips_disable_fpu.patch

    r39348 r39789  
    99--- a/arch/mips/Kconfig 
    1010+++ b/arch/mips/Kconfig 
    11 @@ -928,6 +928,17 @@ config I8259 
     11@@ -934,6 +934,17 @@ config I8259 
    1212 config MIPS_BONITO64 
    1313        bool 
     
    5454 { 
    5555        static int first = 1; 
    56 @@ -113,3 +114,36 @@ int fpu_emulator_restore_context32(struc 
     56@@ -115,3 +116,36 @@ int fpu_emulator_restore_context32(struc 
    5757        return err; 
    5858 } 
     
    143143--- a/arch/mips/kernel/traps.c 
    144144+++ b/arch/mips/kernel/traps.c 
    145 @@ -700,6 +700,7 @@ asmlinkage void do_ov(struct pt_regs *re 
     145@@ -701,6 +701,7 @@ asmlinkage void do_ov(struct pt_regs *re 
    146146        exception_exit(prev_state); 
    147147 } 
     
    151151 { 
    152152        if (sig == SIGSEGV || sig == SIGBUS) { 
    153 @@ -723,6 +724,7 @@ int process_fpemu_return(int sig, void _ 
     153@@ -724,6 +725,7 @@ int process_fpemu_return(int sig, void _ 
    154154                return 0; 
    155155        } 
  • trunk/target/linux/generic/patches-3.14/309-mips_fuse_workaround.patch

    r36663 r39789  
    11--- a/arch/mips/mm/cache.c 
    22+++ b/arch/mips/mm/cache.c 
    3 @@ -39,6 +39,7 @@ void (*__flush_kernel_vmap_range)(unsign 
     3@@ -38,6 +38,7 @@ void (*__flush_kernel_vmap_range)(unsign 
    44 void (*__invalidate_kernel_vmap_range)(unsigned long vaddr, int size); 
    55  
  • trunk/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch

    r38643 r39789  
    6464 } 
    6565  
    66 -int mtd_add_partition(struct mtd_info *master, char *name, 
     66-int mtd_add_partition(struct mtd_info *master, const char *name, 
    6767-                     long long offset, long long length) 
    6868+ 
    6969+static int 
    70 +__mtd_add_partition(struct mtd_info *master, char *name, 
     70+__mtd_add_partition(struct mtd_info *master, const char *name, 
    7171+                   long long offset, long long length, bool dup_check) 
    7272 { 
     
    112112 EXPORT_SYMBOL_GPL(mtd_add_partition); 
    113113  
    114 +int mtd_add_partition(struct mtd_info *master, char *name, 
     114+int mtd_add_partition(struct mtd_info *master, const char *name, 
    115115+                     long long offset, long long length) 
    116116+{ 
  • trunk/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch

    r38643 r39789  
    4040+} 
    4141+ 
    42  int register_mtd_parser(struct mtd_part_parser *p) 
     42 void register_mtd_parser(struct mtd_part_parser *p) 
    4343 { 
    4444        spin_lock(&part_parser_lock); 
    45 @@ -900,6 +924,38 @@ int parse_mtd_partitions(struct mtd_info 
     45@@ -897,6 +921,38 @@ int parse_mtd_partitions(struct mtd_info 
    4646        return ret; 
    4747 } 
     
    101101 }; 
    102102  
    103  extern int register_mtd_parser(struct mtd_part_parser *parser); 
     103 extern void register_mtd_parser(struct mtd_part_parser *parser); 
    104104@@ -87,4 +92,9 @@ uint64_t mtd_get_device_size(const struc 
    105105 extern void __weak arch_split_mtd_part(struct mtd_info *master, 
  • trunk/target/linux/generic/patches-3.14/405-mtd-add-more-helper-functions.patch

    r39348 r39789  
    1919        if (slave->offset == MTDPART_OFS_RETAIN) { 
    2020                slave->offset = cur_offset; 
    21 @@ -988,6 +986,24 @@ int mtd_is_partition(const struct mtd_in 
     21@@ -985,6 +983,24 @@ int mtd_is_partition(const struct mtd_in 
    2222 } 
    2323 EXPORT_SYMBOL_GPL(mtd_is_partition); 
     
    4747+++ b/include/linux/mtd/partitions.h 
    4848@@ -90,6 +90,8 @@ int mtd_is_partition(const struct mtd_in 
    49  int mtd_add_partition(struct mtd_info *master, char *name, 
     49 int mtd_add_partition(struct mtd_info *master, const char *name, 
    5050                      long long offset, long long length); 
    5151 int mtd_del_partition(struct mtd_info *master, int partno); 
  • trunk/target/linux/generic/patches-3.14/410-mtd-move-forward-declaration-of-struct-mtd_info.patch

    r37974 r39789  
    88  
    99 struct mtd_partition { 
    10         char *name;                     /* identifier string */ 
     10        const char *name;               /* identifier string */ 
    1111@@ -50,7 +51,6 @@ struct mtd_partition { 
    1212 #define MTDPART_SIZ_FULL       (0) 
  • trunk/target/linux/generic/patches-3.14/430-mtd-add-myloader-partition-parser.patch

    r39387 r39789  
    2323 comment "User Modules And Translation Layers" 
    2424  
    25  config MTD_BLKDEVS 
     25 # 
    2626--- a/drivers/mtd/Makefile 
    2727+++ b/drivers/mtd/Makefile 
  • trunk/target/linux/generic/patches-3.14/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch

    r39348 r39789  
    66--- a/include/linux/mtd/nand.h 
    77+++ b/include/linux/mtd/nand.h 
    8 @@ -721,6 +721,7 @@ struct platform_nand_chip { 
     8@@ -756,6 +756,7 @@ struct platform_nand_chip { 
    99        unsigned int options; 
    1010        unsigned int bbt_options; 
     
    1616--- a/drivers/mtd/nand/plat_nand.c 
    1717+++ b/drivers/mtd/nand/plat_nand.c 
    18 @@ -103,7 +103,18 @@ static int plat_nand_probe(struct platfo 
     18@@ -90,7 +90,18 @@ static int plat_nand_probe(struct platfo 
    1919        } 
    2020  
  • trunk/target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch

    r39348 r39789  
    1818--- a/drivers/mtd/devices/m25p80.c 
    1919+++ b/drivers/mtd/devices/m25p80.c 
    20 @@ -82,6 +82,12 @@ 
     20@@ -90,6 +90,12 @@ 
    2121  
    2222 #define JEDEC_MFR(_jedec_id)   ((_jedec_id) >> 16) 
     
    3030 /****************************************************************************/ 
    3131  
    32  struct m25p { 
    33 @@ -1035,7 +1041,7 @@ static int m25p_probe(struct spi_device 
     32 enum read_type { 
     33@@ -1195,7 +1201,7 @@ static int m25p_probe(struct spi_device 
    3434                flash->mtd._write = m25p80_write; 
    3535  
  • trunk/target/linux/generic/patches-3.14/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch

    r39348 r39789  
    1111--- a/drivers/mtd/devices/m25p80.c 
    1212+++ b/drivers/mtd/devices/m25p80.c 
    13 @@ -866,6 +866,7 @@ static const struct spi_device_id m25p_i 
     13@@ -1025,6 +1025,7 @@ static const struct spi_device_id m25p_i 
    1414        { "m25px64",    INFO(0x207117,  0, 64 * 1024, 128, 0) }, 
    1515  
  • trunk/target/linux/generic/patches-3.14/480-mtd-set-rootfs-to-be-root-dev.patch

    r39348 r39789  
    99 #include <linux/mtd/mtd.h> 
    1010 #include <linux/mtd/partitions.h> 
    11 @@ -422,6 +423,15 @@ int add_mtd_device(struct mtd_info *mtd) 
     11@@ -414,6 +415,15 @@ int add_mtd_device(struct mtd_info *mtd) 
    1212           of this try_ nonsense, and no bitching about it 
    1313           either. :) */ 
  • trunk/target/linux/generic/patches-3.14/500-yaffs-Kbuild-integration.patch

    r36663 r39789  
    1111--- a/fs/Makefile 
    1212+++ b/fs/Makefile 
    13 @@ -127,3 +127,5 @@ obj-y                               += exofs/ # Multiple modules 
     13@@ -126,3 +126,5 @@ obj-y                               += exofs/ # Multiple modules 
    1414 obj-$(CONFIG_CEPH_FS)          += ceph/ 
    1515 obj-$(CONFIG_PSTORE)           += pstore/ 
  • trunk/target/linux/generic/patches-3.14/530-jffs2_make_lzma_available.patch

    r39348 r39789  
    10821082 ORIG_CFLAGS := $(KBUILD_CFLAGS) 
    10831083 KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS)) 
    1084 @@ -79,6 +89,8 @@ obj-$(CONFIG_LZ4HC_COMPRESS) += lz4/ 
     1084@@ -82,6 +92,8 @@ obj-$(CONFIG_LZ4HC_COMPRESS) += lz4/ 
    10851085 obj-$(CONFIG_LZ4_DECOMPRESS) += lz4/ 
    10861086 obj-$(CONFIG_XZ_DEC) += xz/ 
  • trunk/target/linux/generic/patches-3.14/540-crypto-xz-decompression-support.patch

    r39348 r39789  
    1717--- a/crypto/Makefile 
    1818+++ b/crypto/Makefile 
    19 @@ -93,6 +93,7 @@ obj-$(CONFIG_CRYPTO_AUTHENC) += authenc. 
     19@@ -88,6 +88,7 @@ obj-$(CONFIG_CRYPTO_AUTHENC) += authenc. 
    2020 obj-$(CONFIG_CRYPTO_LZO) += lzo.o 
    2121 obj-$(CONFIG_CRYPTO_LZ4) += lz4.o 
  • trunk/target/linux/generic/patches-3.14/600-netfilter_layer7_2.22.patch

    r39348 r39789  
    11--- a/net/netfilter/Kconfig 
    22+++ b/net/netfilter/Kconfig 
    3 @@ -1247,6 +1247,27 @@ config NETFILTER_XT_MATCH_STATE 
     3@@ -1345,6 +1345,27 @@ config NETFILTER_XT_MATCH_STATE 
    44  
    55          To compile it as a module, choose M here.  If unsure, say N. 
     
    3131--- a/net/netfilter/Makefile 
    3232+++ b/net/netfilter/Makefile 
    33 @@ -152,6 +152,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
     33@@ -158,6 +158,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
    3434 obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o 
    3535 obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o 
     
    20602060--- a/net/netfilter/nf_conntrack_core.c 
    20612061+++ b/net/netfilter/nf_conntrack_core.c 
    2062 @@ -226,6 +226,13 @@ destroy_conntrack(struct nf_conntrack *n 
     2062@@ -220,6 +220,13 @@ destroy_conntrack(struct nf_conntrack *n 
    20632063         * too. */ 
    20642064        nf_ct_remove_expectations(ct); 
     
    21322132--- a/include/uapi/linux/netfilter/Kbuild 
    21332133+++ b/include/uapi/linux/netfilter/Kbuild 
    2134 @@ -56,6 +56,7 @@ header-y += xt_hashlimit.h 
    2135  header-y += xt_helper.h 
     2134@@ -59,6 +59,7 @@ header-y += xt_ipcomp.h 
    21362135 header-y += xt_iprange.h 
    21372136 header-y += xt_ipvs.h 
     2137 header-y += xt_l2tp.h 
    21382138+header-y += xt_layer7.h 
    21392139 header-y += xt_length.h 
  • trunk/target/linux/generic/patches-3.14/603-netfilter_layer7_2.6.36_fix.patch

    r39348 r39789  
    11--- a/net/netfilter/Kconfig 
    22+++ b/net/netfilter/Kconfig 
    3 @@ -1053,6 +1053,27 @@ config NETFILTER_XT_MATCH_IPVS 
     3@@ -1151,6 +1151,27 @@ config NETFILTER_XT_MATCH_L2TP 
    44  
    5           If unsure, say N. 
     5        To compile it as a module, choose M here. If unsure, say N. 
    66  
    77+config NETFILTER_XT_MATCH_LAYER7 
     
    2929        tristate '"length" match support' 
    3030        depends on NETFILTER_ADVANCED 
    31 @@ -1247,26 +1268,11 @@ config NETFILTER_XT_MATCH_STATE 
     31@@ -1345,26 +1366,11 @@ config NETFILTER_XT_MATCH_STATE 
    3232  
    3333          To compile it as a module, choose M here.  If unsure, say N. 
  • trunk/target/linux/generic/patches-3.14/620-sched_esfq.patch

    r39348 r39789  
    11--- a/include/uapi/linux/pkt_sched.h 
    22+++ b/include/uapi/linux/pkt_sched.h 
    3 @@ -224,6 +224,33 @@ struct tc_sfq_xstats { 
     3@@ -226,6 +226,33 @@ struct tc_sfq_xstats { 
    44        __s32           allot; 
    55 }; 
  • trunk/target/linux/generic/patches-3.14/621-sched_act_connmark.patch

    r39348 r39789  
    152152--- a/net/sched/Kconfig 
    153153+++ b/net/sched/Kconfig 
    154 @@ -694,6 +694,19 @@ config NET_ACT_CSUM 
     154@@ -717,6 +717,19 @@ config NET_ACT_CSUM 
    155155          To compile this code as a module, choose M here: the 
    156156          module will be called act_csum. 
  • trunk/target/linux/generic/patches-3.14/630-packet_socket_type.patch

    r39348 r39789  
    88--- a/include/uapi/linux/if_packet.h 
    99+++ b/include/uapi/linux/if_packet.h 
    10 @@ -29,6 +29,8 @@ struct sockaddr_ll { 
    11  /* These ones are invisible by user level */ 
    12  #define PACKET_LOOPBACK                5               /* MC/BRD frame looped back */ 
     10@@ -31,6 +31,8 @@ struct sockaddr_ll { 
     11 #define PACKET_KERNEL          7               /* To kernel space      */ 
     12 /* Unused, PACKET_FASTROUTE and PACKET_LOOPBACK are invisible to user space */ 
    1313 #define PACKET_FASTROUTE       6               /* Fastrouted frame     */ 
    1414+#define PACKET_MASK_ANY                0xffffffff      /* mask for packet type bits */ 
     
    1717 /* Packet socket options */ 
    1818  
    19 @@ -51,6 +53,7 @@ struct sockaddr_ll { 
    20  #define PACKET_TIMESTAMP               17 
     19@@ -54,6 +56,7 @@ struct sockaddr_ll { 
    2120 #define PACKET_FANOUT                  18 
    2221 #define PACKET_TX_HAS_OFF              19 
    23 +#define PACKET_RECV_TYPE               20 
     22 #define PACKET_QDISC_BYPASS            20 
     23+#define PACKET_RECV_TYPE               21 
    2424  
    2525 #define PACKET_FANOUT_HASH             0 
     
    2727--- a/net/packet/af_packet.c 
    2828+++ b/net/packet/af_packet.c 
    29 @@ -1414,6 +1414,7 @@ static int packet_rcv_spkt(struct sk_buf 
     29@@ -1539,6 +1539,7 @@ static int packet_rcv_spkt(struct sk_buf 
    3030 { 
    3131        struct sock *sk; 
     
    3535        /* 
    3636         *      When we registered the protocol we saved the socket in the data 
    37 @@ -1421,6 +1422,7 @@ static int packet_rcv_spkt(struct sk_buf 
     37@@ -1546,6 +1547,7 @@ static int packet_rcv_spkt(struct sk_buf 
    3838         */ 
    3939  
     
    4343        /* 
    4444         *      Yank back the headers [hope the device set this 
    45 @@ -1433,7 +1435,7 @@ static int packet_rcv_spkt(struct sk_buf 
     45@@ -1558,7 +1560,7 @@ static int packet_rcv_spkt(struct sk_buf 
    4646         *      so that this procedure is noop. 
    4747         */ 
     
    5252  
    5353        if (!net_eq(dev_net(dev), sock_net(sk))) 
    54 @@ -1640,12 +1642,12 @@ static int packet_rcv(struct sk_buff *sk 
     54@@ -1765,12 +1767,12 @@ static int packet_rcv(struct sk_buff *sk 
    5555        int skb_len = skb->len; 
    5656        unsigned int snaplen, res; 
     
    6868                goto drop; 
    6969  
    70 @@ -1758,12 +1760,12 @@ static int tpacket_rcv(struct sk_buff *s 
    71         struct timespec ts; 
    72         __u32 ts_status; 
     70@@ -1890,12 +1892,12 @@ static int tpacket_rcv(struct sk_buff *s 
     71        BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); 
     72        BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); 
    7373  
    7474-       if (skb->pkt_type == PACKET_LOOPBACK) 
     
    8484                goto drop; 
    8585  
    86 @@ -2652,6 +2654,7 @@ static int packet_create(struct net *net 
     86@@ -2810,6 +2812,7 @@ static int packet_create(struct net *net 
    8787        spin_lock_init(&po->bind_lock); 
    8888        mutex_init(&po->pg_vec_lock); 
     
    9292        if (sock->type == SOCK_PACKET) 
    9393                po->prot_hook.func = packet_rcv_spkt; 
    94 @@ -3218,6 +3221,16 @@ packet_setsockopt(struct socket *sock, i 
    95                 po->tp_tx_has_off = !!val; 
     94@@ -3392,6 +3395,16 @@ packet_setsockopt(struct socket *sock, i 
     95                po->xmit = val ? packet_direct_xmit : dev_queue_xmit; 
    9696                return 0; 
    9797        } 
     
    109109                return -ENOPROTOOPT; 
    110110        } 
    111 @@ -3269,6 +3282,13 @@ static int packet_getsockopt(struct sock 
     111@@ -3443,6 +3456,13 @@ static int packet_getsockopt(struct sock 
    112112        case PACKET_VNET_HDR: 
    113113                val = po->has_vnet_hdr; 
     
    125125--- a/net/packet/internal.h 
    126126+++ b/net/packet/internal.h 
    127 @@ -115,6 +115,7 @@ struct packet_sock { 
    128         unsigned int            tp_tstamp; 
     127@@ -116,6 +116,7 @@ struct packet_sock { 
    129128        struct net_device __rcu *cached_dev; 
     129        int                     (*xmit)(struct sk_buff *skb); 
    130130        struct packet_type      prot_hook ____cacheline_aligned_in_smp; 
    131131+       unsigned int            pkt_type; 
  • trunk/target/linux/generic/patches-3.14/642-bridge_port_isolate.patch

    r38572 r39789  
    11--- a/net/bridge/br_private.h 
    22+++ b/net/bridge/br_private.h 
    3 @@ -173,6 +173,7 @@ struct net_bridge_port 
     3@@ -174,6 +174,7 @@ struct net_bridge_port 
    44 #define BR_ADMIN_COST          0x00000010 
    55 #define BR_LEARNING            0x00000020 
  • trunk/target/linux/generic/patches-3.14/643-bridge_remove_ipv6_dependency.patch

    r39348 r39789  
    3333--- a/net/ipv6/addrconf.c 
    3434+++ b/net/ipv6/addrconf.c 
    35 @@ -1279,7 +1279,7 @@ out: 
     35@@ -1304,7 +1304,7 @@ out: 
    3636        return ret; 
    3737 } 
     
    4242                       struct in6_addr *saddr) 
    4343 { 
    44 @@ -1404,7 +1404,6 @@ try_nextdev: 
     44@@ -1429,7 +1429,6 @@ try_nextdev: 
    4545        in6_ifa_put(hiscore->ifa); 
    4646        return 0; 
     
    4949  
    5050 int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr, 
    51                       unsigned char banned_flags) 
    52 @@ -5152,6 +5151,9 @@ int __init addrconf_init(void) 
     51                      u32 banned_flags) 
     52@@ -5294,6 +5293,9 @@ int __init addrconf_init(void) 
    5353  
    5454        ipv6_addr_label_rtnl_register(); 
     
    6060 errout: 
    6161        rtnl_af_unregister(&inet6_ops); 
    62 @@ -5170,6 +5172,9 @@ void addrconf_cleanup(void) 
     62@@ -5311,6 +5313,9 @@ void addrconf_cleanup(void) 
    6363        struct net_device *dev; 
    6464        int i; 
  • trunk/target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch

    r39533 r39789  
    108108 #else 
    109109 #define br_netfilter_init()    (0) 
    110  #define br_netfilter_fini()    do { } while(0) 
     110 #define br_netfilter_fini()    do { } while (0) 
    111111 #define br_netfilter_rtable_init(x) 
    112112+#define br_netfilter_run_hooks()       false 
     
    140140--- a/net/bridge/netfilter/ebtables.c 
    141141+++ b/net/bridge/netfilter/ebtables.c 
    142 @@ -2407,11 +2407,13 @@ static int __init ebtables_init(void) 
     142@@ -2406,11 +2406,13 @@ static int __init ebtables_init(void) 
    143143        } 
    144144  
  • trunk/target/linux/generic/patches-3.14/653-disable_netlink_trim.patch

    r38528 r39789  
    11--- a/net/netlink/af_netlink.c 
    22+++ b/net/netlink/af_netlink.c 
    3 @@ -1665,27 +1665,7 @@ void netlink_detachskb(struct sock *sk, 
     3@@ -1673,27 +1673,7 @@ void netlink_detachskb(struct sock *sk, 
    44  
    55 static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) 
  • trunk/target/linux/generic/patches-3.14/655-increase_skb_pad.patch

    r39348 r39789  
    11--- a/include/linux/skbuff.h 
    22+++ b/include/linux/skbuff.h 
    3 @@ -1746,7 +1746,7 @@ static inline int pskb_network_may_pull( 
     3@@ -1828,7 +1828,7 @@ static inline int pskb_network_may_pull( 
    44  * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) 
    55  */ 
  • trunk/target/linux/generic/patches-3.14/656-skb_reduce_truesize-helper.patch

    r39348 r39789  
    1515--- a/include/linux/skbuff.h 
    1616+++ b/include/linux/skbuff.h 
    17 @@ -1791,6 +1791,24 @@ static inline void pskb_trim_unique(stru 
     17@@ -1873,6 +1873,24 @@ static inline void pskb_trim_unique(stru 
    1818        BUG_ON(err); 
    1919 } 
  • trunk/target/linux/generic/patches-3.14/660-fq_codel_defaults.patch

    r36663 r39789  
    1010-       q->quantum = psched_mtu(qdisc_dev(sch)); 
    1111+       q->quantum = 300; 
    12         q->perturbation = net_random(); 
     12        q->perturbation = prandom_u32(); 
    1313        INIT_LIST_HEAD(&q->new_flows); 
    1414        INIT_LIST_HEAD(&q->old_flows); 
  • trunk/target/linux/generic/patches-3.14/664-codel_fix_3_12.patch

    r39348 r39789  
    11--- a/net/sched/sch_api.c 
    22+++ b/net/sched/sch_api.c 
    3 @@ -1909,7 +1909,7 @@ static int __init pktsched_init(void) 
     3@@ -1913,7 +1913,7 @@ static int __init pktsched_init(void) 
    44                return err; 
    55        } 
  • trunk/target/linux/generic/patches-3.14/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch

    r39348 r39789  
    2323--- a/include/net/netns/ipv6.h 
    2424+++ b/include/net/netns/ipv6.h 
    25 @@ -55,6 +55,7 @@ struct netns_ipv6 { 
     25@@ -57,6 +57,7 @@ struct netns_ipv6 { 
    2626        unsigned long            ip6_rt_last_gc; 
    2727 #ifdef CONFIG_IPV6_MULTIPLE_TABLES 
     
    113113--- a/net/ipv6/route.c 
    114114+++ b/net/ipv6/route.c 
    115 @@ -86,6 +86,8 @@ static int            ip6_pkt_discard(struct sk_bu 
     115@@ -87,6 +87,8 @@ static int            ip6_pkt_discard(struct sk_bu 
    116116 static int             ip6_pkt_discard_out(struct sk_buff *skb); 
    117117 static int             ip6_pkt_prohibit(struct sk_buff *skb); 
     
    122122 static void            ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk, 
    123123                                           struct sk_buff *skb, u32 mtu); 
    124 @@ -251,6 +253,21 @@ static const struct rt6_info ip6_prohibi 
     124@@ -282,6 +284,21 @@ static const struct rt6_info ip6_prohibi 
    125125        .rt6i_ref       = ATOMIC_INIT(1), 
    126126 }; 
     
    144144        .dst = { 
    145145                .__refcnt       = ATOMIC_INIT(1), 
    146 @@ -1576,6 +1593,11 @@ int ip6_route_add(struct fib6_config *cf 
     146@@ -1594,6 +1611,11 @@ int ip6_route_add(struct fib6_config *cf 
    147147                        rt->dst.output = ip6_pkt_prohibit_out; 
    148148                        rt->dst.input = ip6_pkt_prohibit; 
     
    156156                default: 
    157157                        rt->dst.error = (cfg->fc_type == RTN_THROW) ? -EAGAIN 
    158 @@ -2155,6 +2177,17 @@ static int ip6_pkt_prohibit_out(struct s 
     158@@ -2173,6 +2195,17 @@ static int ip6_pkt_prohibit_out(struct s 
    159159        return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES); 
    160160 } 
     
    174174  *     Allocate a dst for local (unicast / anycast) address. 
    175175  */ 
    176 @@ -2357,7 +2390,8 @@ static int rtm_to_fib6_config(struct sk_ 
     176@@ -2375,7 +2408,8 @@ static int rtm_to_fib6_config(struct sk_ 
    177177        if (rtm->rtm_type == RTN_UNREACHABLE || 
    178178            rtm->rtm_type == RTN_BLACKHOLE || 
     
    184184  
    185185        if (rtm->rtm_type == RTN_LOCAL) 
    186 @@ -2559,6 +2593,9 @@ static int rt6_fill_node(struct net *net 
     186@@ -2577,6 +2611,9 @@ static int rt6_fill_node(struct net *net 
    187187                case -EACCES: 
    188188                        rtm->rtm_type = RTN_PROHIBIT; 
     
    194194                        rtm->rtm_type = RTN_THROW; 
    195195                        break; 
    196 @@ -2809,6 +2846,8 @@ static int ip6_route_dev_notify(struct n 
     196@@ -2827,6 +2864,8 @@ static int ip6_route_dev_notify(struct n 
    197197 #ifdef CONFIG_IPV6_MULTIPLE_TABLES 
    198198                net->ipv6.ip6_prohibit_entry->dst.dev = dev; 
     
    203203                net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); 
    204204 #endif 
    205 @@ -3025,6 +3064,17 @@ static int __net_init ip6_route_net_init 
     205@@ -3043,6 +3082,17 @@ static int __net_init ip6_route_net_init 
    206206        net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; 
    207207        dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, 
     
    221221  
    222222        net->ipv6.sysctl.flush_delay = 0; 
    223 @@ -3043,6 +3093,8 @@ out: 
     223@@ -3061,6 +3111,8 @@ out: 
    224224        return ret; 
    225225  
     
    230230        kfree(net->ipv6.ip6_prohibit_entry); 
    231231 out_ip6_null_entry: 
    232 @@ -3060,6 +3112,7 @@ static void __net_exit ip6_route_net_exi 
     232@@ -3078,6 +3130,7 @@ static void __net_exit ip6_route_net_exi 
    233233 #ifdef CONFIG_IPV6_MULTIPLE_TABLES 
    234234        kfree(net->ipv6.ip6_prohibit_entry); 
     
    238238        dst_entries_destroy(&net->ipv6.ip6_dst_ops); 
    239239 } 
    240 @@ -3156,6 +3209,9 @@ int __init ip6_route_init(void) 
     240@@ -3174,6 +3227,9 @@ int __init ip6_route_init(void) 
    241241        init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); 
    242242        init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; 
  • trunk/target/linux/generic/patches-3.14/701-phy_extension.patch

    r39348 r39789  
    11--- a/drivers/net/phy/phy.c 
    22+++ b/drivers/net/phy/phy.c 
    3 @@ -302,6 +302,50 @@ int phy_ethtool_gset(struct phy_device * 
     3@@ -293,6 +293,50 @@ int phy_ethtool_gset(struct phy_device * 
    44 } 
    55 EXPORT_SYMBOL(phy_ethtool_gset); 
     
    5454--- a/include/linux/phy.h 
    5555+++ b/include/linux/phy.h 
    56 @@ -578,6 +578,7 @@ void phy_start_machine(struct phy_device 
     56@@ -627,6 +627,7 @@ void phy_start_machine(struct phy_device 
    5757 void phy_stop_machine(struct phy_device *phydev); 
    5858 int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd); 
    5959 int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd); 
    6060+int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr); 
    61  int phy_mii_ioctl(struct phy_device *phydev, 
    62                 struct ifreq *ifr, int cmd); 
     61 int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd); 
    6362 int phy_start_interrupts(struct phy_device *phydev); 
     63 void phy_print_status(struct phy_device *phydev); 
  • trunk/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch

    r38528 r39789  
    11--- a/include/linux/phy.h 
    22+++ b/include/linux/phy.h 
    3 @@ -412,9 +412,18 @@ struct phy_driver { 
     3@@ -417,9 +417,18 @@ struct phy_driver { 
    44         */ 
    55        int (*config_aneg)(struct phy_device *phydev); 
     
    2222--- a/drivers/net/phy/phy_device.c 
    2323+++ b/drivers/net/phy/phy_device.c 
    24 @@ -796,6 +796,9 @@ int genphy_update_link(struct phy_device 
     24@@ -882,6 +882,9 @@ int genphy_update_link(struct phy_device 
    2525 { 
    2626        int status; 
     
    3131        /* Do a fake read */ 
    3232        status = phy_read(phydev, MII_BMSR); 
    33   
     33        if (status < 0) 
    3434--- a/drivers/net/phy/phy.c 
    3535+++ b/drivers/net/phy/phy.c 
    36 @@ -108,6 +108,9 @@ static inline int phy_aneg_done(struct p 
     36@@ -99,6 +99,9 @@ static int phy_config_interrupt(struct p 
     37  */ 
     38 static inline int phy_aneg_done(struct phy_device *phydev) 
    3739 { 
    38         int retval; 
    39   
    4040+       if (phydev->drv->aneg_done) 
    4141+               return phydev->drv->aneg_done(phydev); 
    4242+ 
    43         retval = phy_read(phydev, MII_BMSR); 
     43        int retval = phy_read(phydev, MII_BMSR); 
    4444  
    4545        return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE); 
  • trunk/target/linux/generic/patches-3.14/703-phy-add-detach-callback-to-struct-phy_driver.patch

    r38528 r39789  
    11--- a/drivers/net/phy/phy_device.c 
    22+++ b/drivers/net/phy/phy_device.c 
    3 @@ -613,6 +613,9 @@ EXPORT_SYMBOL(phy_attach); 
    4   */ 
     3@@ -662,6 +662,9 @@ EXPORT_SYMBOL(phy_attach); 
    54 void phy_detach(struct phy_device *phydev) 
    65 { 
     6        int i; 
    77+       if (phydev->drv && phydev->drv->detach) 
    88+               phydev->drv->detach(phydev); 
     
    1010        phydev->attached_dev->phydev = NULL; 
    1111        phydev->attached_dev = NULL; 
    12   
     12        phy_suspend(phydev); 
    1313--- a/include/linux/phy.h 
    1414+++ b/include/linux/phy.h 
    15 @@ -436,6 +436,12 @@ struct phy_driver { 
     15@@ -441,6 +441,12 @@ struct phy_driver { 
    1616         */ 
    1717        int (*did_interrupt)(struct phy_device *phydev); 
  • trunk/target/linux/generic/patches-3.14/710-phy-add-mdio_register_board_info.patch

    r39348 r39789  
    11--- a/drivers/net/phy/mdio_bus.c 
    22+++ b/drivers/net/phy/mdio_bus.c 
    3 @@ -41,6 +41,8 @@ 
     3@@ -38,6 +38,8 @@ 
     4  
    45 #include <asm/irq.h> 
    5  #include <asm/uaccess.h> 
    66  
    77+#include "mdio-boardinfo.h" 
     
    1010  * mdiobus_alloc_size - allocate a mii_bus structure 
    1111  * @size: extra amount of memory to allocate for private storage. 
    12 @@ -229,15 +231,33 @@ void mdiobus_free(struct mii_bus *bus) 
     12@@ -224,15 +226,33 @@ void mdiobus_free(struct mii_bus *bus) 
    1313 } 
    1414 EXPORT_SYMBOL(mdiobus_free); 
     
    4646--- a/include/linux/phy.h 
    4747+++ b/include/linux/phy.h 
    48 @@ -619,4 +619,22 @@ int __init mdio_bus_init(void); 
     48@@ -667,4 +667,22 @@ int __init mdio_bus_init(void); 
    4949 void mdio_bus_exit(void); 
    5050  
  • trunk/target/linux/generic/patches-3.14/721-phy_packets.patch

    r39348 r39789  
    11--- a/include/linux/netdevice.h 
    22+++ b/include/linux/netdevice.h 
    3 @@ -1227,6 +1227,11 @@ struct net_device { 
     3@@ -1244,6 +1244,11 @@ struct net_device { 
    44        const struct ethtool_ops *ethtool_ops; 
    55        const struct forwarding_accel_ops *fwd_ops; 
     
    1313        const struct header_ops *header_ops; 
    1414  
    15 @@ -1292,6 +1297,9 @@ struct net_device { 
     15@@ -1312,6 +1317,9 @@ struct net_device { 
    1616        void                    *ax25_ptr;      /* AX.25 specific data */ 
    1717        struct wireless_dev     *ieee80211_ptr; /* IEEE 802.11 specific data, 
     
    3535--- a/include/linux/skbuff.h 
    3636+++ b/include/linux/skbuff.h 
    37 @@ -1776,6 +1776,10 @@ static inline int pskb_trim(struct sk_bu 
     37@@ -1858,6 +1858,10 @@ static inline int pskb_trim(struct sk_bu 
    3838        return (len < skb->len) ? __pskb_trim(skb, len) : 0; 
    3939 } 
     
    4646  *     pskb_trim_unique - remove end from a paged unique (not cloned) buffer 
    4747  *     @skb: buffer to alter 
    48 @@ -1902,16 +1906,6 @@ static inline struct sk_buff *dev_alloc_ 
     48@@ -1984,16 +1988,6 @@ static inline struct sk_buff *dev_alloc_ 
    4949 } 
    5050  
     
    8080--- a/net/core/dev.c 
    8181+++ b/net/core/dev.c 
    82 @@ -2604,10 +2604,20 @@ int dev_hard_start_xmit(struct sk_buff * 
     82@@ -2602,10 +2602,20 @@ int dev_hard_start_xmit(struct sk_buff * 
    8383                if (!list_empty(&ptype_all)) 
    8484                        dev_queue_xmit_nit(skb, dev); 
    8585  
    8686-               skb_len = skb->len; 
    87 -                       rc = ops->ndo_start_xmit(skb, dev); 
     87-               trace_net_dev_start_xmit(skb, dev); 
     88-               rc = ops->ndo_start_xmit(skb, dev); 
     89-               trace_net_dev_xmit(skb, rc, dev, skb_len); 
    8890+#ifdef CONFIG_ETHERNET_PACKET_MANGLE 
    8991+               if (!dev->eth_mangle_tx || 
     
    9496+               { 
    9597+                       skb_len = skb->len; 
    96 +                               rc = ops->ndo_start_xmit(skb, dev); 
    97   
    98 -               trace_net_dev_xmit(skb, rc, dev, skb_len); 
     98+                       trace_net_dev_start_xmit(skb, dev); 
     99+                       rc = ops->ndo_start_xmit(skb, dev); 
    99100+                       trace_net_dev_xmit(skb, rc, dev, skb_len); 
    100101+               } else { 
     
    106107--- a/net/core/skbuff.c 
    107108+++ b/net/core/skbuff.c 
    108 @@ -60,6 +60,7 @@ 
     109@@ -62,6 +62,7 @@ 
    109110 #include <linux/scatterlist.h> 
    110111 #include <linux/errqueue.h> 
     
    114115 #include <net/protocol.h> 
    115116 #include <net/dst.h> 
    116 @@ -466,6 +467,22 @@ struct sk_buff *__netdev_alloc_skb(struc 
     117@@ -439,6 +440,22 @@ struct sk_buff *__netdev_alloc_skb(struc 
    117118 } 
    118119 EXPORT_SYMBOL(__netdev_alloc_skb); 
     
    139140--- a/net/ethernet/eth.c 
    140141+++ b/net/ethernet/eth.c 
    141 @@ -159,6 +159,12 @@ __be16 eth_type_trans(struct sk_buff *sk 
    142         struct ethhdr *eth; 
     142@@ -161,6 +161,12 @@ __be16 eth_type_trans(struct sk_buff *sk 
     143        const struct ethhdr *eth; 
    143144  
    144145        skb->dev = dev; 
  • trunk/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch

    r39534 r39789  
    22--- a/drivers/usb/host/pci-quirks.c 
    33+++ b/drivers/usb/host/pci-quirks.c 
    4 @@ -98,6 +98,8 @@ struct amd_chipset_type { 
     4@@ -97,6 +97,8 @@ struct amd_chipset_type { 
    55        u8 rev; 
    66 }; 
     
    1111        struct pci_dev  *nb_dev; 
    1212        struct pci_dev  *smbus_dev; 
    13 @@ -455,6 +457,10 @@ void usb_amd_dev_put(void) 
     13@@ -454,6 +456,10 @@ void usb_amd_dev_put(void) 
    1414 } 
    1515 EXPORT_SYMBOL_GPL(usb_amd_dev_put); 
     
    2222  * Make sure the controller is completely inactive, unable to 
    2323  * generate interrupts or do DMA. 
    24 @@ -534,8 +540,17 @@ reset_needed: 
     24@@ -533,8 +539,17 @@ reset_needed: 
    2525        uhci_reset_hc(pdev, base); 
    2626        return 1; 
     
    4040 { 
    4141        u16 cmd; 
    42 @@ -1064,3 +1079,4 @@ static void quirk_usb_early_handoff(stru 
     42@@ -1063,3 +1078,4 @@ static void quirk_usb_early_handoff(stru 
    4343 } 
    4444 DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, 
  • trunk/target/linux/generic/patches-3.14/840-rtc7301.patch

    r39348 r39789  
    11--- a/drivers/rtc/Kconfig 
    22+++ b/drivers/rtc/Kconfig 
    3 @@ -878,6 +878,15 @@ config RTC_DRV_NUC900 
     3@@ -900,6 +900,15 @@ config RTC_DRV_NUC900 
    44          If you say yes here you get support for the RTC subsystem of the 
    55          NUC910/NUC920 used in embedded systems. 
     
    1919--- a/drivers/rtc/Makefile 
    2020+++ b/drivers/rtc/Makefile 
    21 @@ -102,6 +102,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01)        += rtc-rp5c 
     21@@ -104,6 +104,7 @@ obj-$(CONFIG_RTC_DRV_RP5C01)        += rtc-rp5c 
    2222 obj-$(CONFIG_RTC_DRV_RS5C313)  += rtc-rs5c313.o 
    2323 obj-$(CONFIG_RTC_DRV_RS5C348)  += rtc-rs5c348.o 
  • trunk/target/linux/generic/patches-3.14/841-rtc_pt7c4338.patch

    r39348 r39789  
    11--- a/drivers/rtc/Kconfig 
    22+++ b/drivers/rtc/Kconfig 
    3 @@ -517,6 +517,15 @@ config RTC_DRV_S5M 
     3@@ -539,6 +539,15 @@ config RTC_DRV_S5M 
    44          This driver can also be built as a module. If so, the module 
    55          will be called rtc-s5m. 
     
    1919--- a/drivers/rtc/Makefile 
    2020+++ b/drivers/rtc/Makefile 
    21 @@ -94,6 +94,7 @@ obj-$(CONFIG_RTC_DRV_PL030)   += rtc-pl030 
     21@@ -96,6 +96,7 @@ obj-$(CONFIG_RTC_DRV_PL030)   += rtc-pl030 
    2222 obj-$(CONFIG_RTC_DRV_PL031)    += rtc-pl031.o 
    2323 obj-$(CONFIG_RTC_DRV_PM8XXX)   += rtc-pm8xxx.o 
  • trunk/target/linux/generic/patches-3.14/862-gpio_spi_driver.patch

    r38528 r39789  
    346346--- a/drivers/spi/Kconfig 
    347347+++ b/drivers/spi/Kconfig 
    348 @@ -202,6 +202,15 @@ config SPI_GPIO 
     348@@ -208,6 +208,15 @@ config SPI_GPIO 
    349349          GPIO operations, you should be able to leverage that for better 
    350350          speed with a custom version of this driver; see the source code. 
     
    364364--- a/drivers/spi/Makefile 
    365365+++ b/drivers/spi/Makefile 
    366 @@ -37,6 +37,7 @@ obj-$(CONFIG_SPI_FSL_LIB)             += spi-fsl-li 
     366@@ -38,6 +38,7 @@ obj-$(CONFIG_SPI_FSL_LIB)             += spi-fsl-li 
    367367 obj-$(CONFIG_SPI_FSL_ESPI)             += spi-fsl-espi.o 
    368368 obj-$(CONFIG_SPI_FSL_SPI)              += spi-fsl-spi.o 
  • trunk/target/linux/generic/patches-3.14/863-gpiommc.patch

    r39348 r39789  
    613613--- a/drivers/mmc/host/Kconfig 
    614614+++ b/drivers/mmc/host/Kconfig 
    615 @@ -485,6 +485,31 @@ config MMC_SDHI 
     615@@ -498,6 +498,31 @@ config MMC_SDHI 
    616616          This provides support for the SDHI SD/SDIO controller found in 
    617617          SuperH and ARM SH-Mobile SoCs 
     
    647647--- a/drivers/mmc/host/Makefile 
    648648+++ b/drivers/mmc/host/Makefile 
    649 @@ -38,6 +38,7 @@ tmio_mmc_core-$(subst m,y,$(CONFIG_MMC_S 
     649@@ -39,6 +39,7 @@ tmio_mmc_core-$(subst m,y,$(CONFIG_MMC_S 
    650650 obj-$(CONFIG_MMC_SDHI)         += sh_mobile_sdhi.o 
    651651 obj-$(CONFIG_MMC_CB710)                += cb710-mmc.o 
     
    831831--- a/MAINTAINERS 
    832832+++ b/MAINTAINERS 
    833 @@ -3881,6 +3881,11 @@ L:       linuxppc-dev@lists.ozlabs.org 
     833@@ -3931,6 +3931,11 @@ L:       linuxppc-dev@lists.ozlabs.org 
    834834 S:     Odd Fixes 
    835835 F:     drivers/tty/hvc/ 
     
    841841+ 
    842842 HARDWARE MONITORING 
    843  M:     Jean Delvare <khali@linux-fr.org> 
     843 M:     Jean Delvare <jdelvare@suse.de> 
    844844 M:     Guenter Roeck <linux@roeck-us.net> 
  • trunk/target/linux/generic/patches-3.14/902-debloat_proc.patch

    r39348 r39789  
    134134--- a/mm/vmstat.c 
    135135+++ b/mm/vmstat.c 
    136 @@ -1300,10 +1300,12 @@ static int __init setup_vmstat(void) 
     136@@ -1302,10 +1302,12 @@ static int __init setup_vmstat(void) 
    137137        put_online_cpus(); 
    138138 #endif 
     
    174174--- a/net/core/sock.c 
    175175+++ b/net/core/sock.c 
    176 @@ -2958,6 +2958,8 @@ static __net_initdata struct pernet_oper 
     176@@ -2933,6 +2933,8 @@ static __net_initdata struct pernet_oper 
    177177  
    178178 static int __init proto_init(void) 
     
    228228--- a/net/ipv4/proc.c 
    229229+++ b/net/ipv4/proc.c 
    230 @@ -516,6 +516,9 @@ static __net_initdata struct pernet_oper 
     230@@ -517,6 +517,9 @@ static __net_initdata struct pernet_oper 
    231231  
    232232 int __init ip_misc_proc_init(void) 
     
    240240--- a/net/ipv4/route.c 
    241241+++ b/net/ipv4/route.c 
    242 @@ -424,6 +424,9 @@ static struct pernet_operations ip_rt_pr 
     242@@ -421,6 +421,9 @@ static struct pernet_operations ip_rt_pr 
    243243  
    244244 static int __init ip_rt_proc_init(void) 
     
    265265+++ b/ipc/sem.c 
    266266@@ -191,6 +191,8 @@ void sem_exit_ns(struct ipc_namespace *n 
    267  void __init sem_init (void) 
     267 void __init sem_init(void) 
    268268 { 
    269269        sem_init_ns(&init_ipc_ns); 
     
    277277@@ -118,6 +118,8 @@ pure_initcall(ipc_ns_init); 
    278278  
    279  void __init shm_init (void) 
     279 void __init shm_init(void) 
    280280 { 
    281281+       if (IS_ENABLED(CONFIG_PROC_STRIPPED)) 
     
    286286--- a/ipc/util.c 
    287287+++ b/ipc/util.c 
    288 @@ -171,6 +171,9 @@ void __init ipc_init_proc_interface(cons 
     288@@ -161,6 +161,9 @@ void __init ipc_init_proc_interface(cons 
    289289        struct proc_dir_entry *pde; 
    290290        struct ipc_proc_iface *iface; 
  • trunk/target/linux/generic/patches-3.14/903-debloat_direct_io.patch

    r39348 r39789  
    2727--- a/include/linux/fs.h 
    2828+++ b/include/linux/fs.h 
    29 @@ -2545,12 +2545,26 @@ enum { 
     29@@ -2553,12 +2553,26 @@ enum { 
    3030        DIO_SKIP_HOLES  = 0x02, 
    3131 }; 
  • trunk/target/linux/generic/patches-3.14/911-kobject_add_broadcast_uevent.patch

    r39348 r39789  
    2020--- a/lib/kobject_uevent.c 
    2121+++ b/lib/kobject_uevent.c 
    22 @@ -382,6 +382,43 @@ int add_uevent_var(struct kobj_uevent_en 
     22@@ -388,6 +388,43 @@ int add_uevent_var(struct kobj_uevent_en 
    2323 EXPORT_SYMBOL_GPL(add_uevent_var); 
    2424  
  • trunk/target/linux/generic/patches-3.14/921-use_preinit_as_init.patch

    r39348 r39789  
    11--- a/init/main.c 
    22+++ b/init/main.c 
    3 @@ -871,7 +871,8 @@ static int __ref kernel_init(void *unuse 
     3@@ -868,7 +868,8 @@ static int __ref kernel_init(void *unuse 
    44                pr_err("Failed to execute %s (error %d).  Attempting defaults...\n", 
    55                        execute_command, ret); 
  • trunk/target/linux/generic/patches-3.14/930-crashlog.patch

    r39348 r39789  
    2121--- a/init/Kconfig 
    2222+++ b/init/Kconfig 
    23 @@ -1223,6 +1223,10 @@ config RELAY 
     23@@ -1211,6 +1211,10 @@ config RELAY 
    2424  
    2525          If unsure, say N. 
     
    265265  
    266266 #include <asm-generic/sections.h> 
    267   
    268 @@ -442,6 +443,8 @@ static void __init_memblock memblock_ins 
     267 #include <linux/io.h> 
     268@@ -469,6 +470,8 @@ static void __init_memblock memblock_ins 
    269269        memblock_set_region_node(rgn, nid); 
    270270        type->cnt++; 
  • trunk/target/linux/generic/patches-3.14/940-ocf_kbuild_integration.patch

    r39348 r39789  
    1010--- a/crypto/Makefile 
    1111+++ b/crypto/Makefile 
    12 @@ -104,6 +104,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg. 
     12@@ -99,6 +99,8 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg. 
    1313 obj-$(CONFIG_CRYPTO_USER_API_HASH) += algif_hash.o 
    1414 obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o 
  • trunk/target/linux/generic/patches-3.14/941-ocf_20120127.patch

    r39350 r39789  
    144144--- a/include/linux/random.h 
    145145+++ b/include/linux/random.h 
    146 @@ -14,6 +14,10 @@ extern void add_input_randomness(unsigne 
     146@@ -13,6 +13,10 @@ extern void add_input_randomness(unsigne 
    147147                                 unsigned int value); 
    148148 extern void add_interrupt_randomness(int irq, int irq_flags); 
  • trunk/target/linux/generic/patches-3.14/950-vm_exports.patch

    r39348 r39789  
    11--- a/mm/shmem.c 
    22+++ b/mm/shmem.c 
    3 @@ -2974,6 +2974,15 @@ put_memory: 
     3@@ -2963,6 +2963,15 @@ put_memory: 
    44        return res; 
    55 } 
     
    1717  * shmem_kernel_file_setup - get an unlinked file living in tmpfs which must be 
    1818  *     kernel internal.  There will be NO LSM permission checks against the 
    19 @@ -3013,11 +3022,8 @@ int shmem_zero_setup(struct vm_area_stru 
     19@@ -3002,11 +3011,8 @@ int shmem_zero_setup(struct vm_area_stru 
    2020        file = shmem_file_setup("dev/zero", size, vma->vm_flags); 
    2121        if (IS_ERR(file)) 
     
    4242--- a/kernel/exit.c 
    4343+++ b/kernel/exit.c 
    44 @@ -490,6 +490,8 @@ static void exit_mm(struct task_struct * 
     44@@ -491,6 +491,8 @@ static void exit_mm(struct task_struct * 
    4545        mm_update_next_owner(mm); 
    4646        mmput(mm); 
     
    5353--- a/kernel/sched/core.c 
    5454+++ b/kernel/sched/core.c 
    55 @@ -2874,6 +2874,7 @@ int can_nice(const struct task_struct *p 
     55@@ -3052,6 +3052,7 @@ int can_nice(const struct task_struct *p 
    5656        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || 
    5757                capable(CAP_SYS_NICE)); 
     
    6363--- a/mm/memory.c 
    6464+++ b/mm/memory.c 
    65 @@ -1391,6 +1391,7 @@ void zap_page_range(struct vm_area_struc 
     65@@ -1392,6 +1392,7 @@ void zap_page_range(struct vm_area_struc 
    6666        mmu_notifier_invalidate_range_end(mm, start, end); 
    6767        tlb_finish_mmu(&tlb, start, end); 
  • trunk/target/linux/generic/patches-3.14/990-gpio_wdt.patch

    r39348 r39789  
    55--- a/drivers/watchdog/Kconfig 
    66+++ b/drivers/watchdog/Kconfig 
    7 @@ -1065,6 +1065,15 @@ config WDT_MTX1 
     7@@ -1084,6 +1084,15 @@ config WDT_MTX1 
    88          Hardware driver for the MTX-1 boards. This is a watchdog timer that 
    99          will reboot the machine after a 100 seconds timer expired. 
     
    2323--- a/drivers/watchdog/Makefile 
    2424+++ b/drivers/watchdog/Makefile 
    25 @@ -129,6 +129,7 @@ obj-$(CONFIG_RC32434_WDT) += rc32434_wdt 
     25@@ -130,6 +130,7 @@ obj-$(CONFIG_RC32434_WDT) += rc32434_wdt 
    2626 obj-$(CONFIG_INDYDOG) += indydog.o 
    2727 obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o 
    2828 obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o 
    29 +obj-$(CONFIG_GPIO_WDT) += gpio_wdt.o 
     29+obj-$(CONFIG_GPIO_WDT) += old_gpio_wdt.o 
    3030 obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o 
    3131 obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o 
    3232 obj-$(CONFIG_AR7_WDT) += ar7_wdt.o 
    3333--- /dev/null 
    34 +++ b/drivers/watchdog/gpio_wdt.c 
     34+++ b/drivers/watchdog/old_gpio_wdt.c 
    3535@@ -0,0 +1,301 @@ 
    3636+/* 
     
    336336+MODULE_ALIAS("platform:gpio-wdt"); 
    337337--- /dev/null 
    338 +++ b/include/linux/gpio_wdt.h 
     338+++ b/include/linux/old_gpio_wdt.h 
    339339@@ -0,0 +1,21 @@ 
    340340+/* 
  • trunk/target/linux/generic/patches-3.14/996-zsmalloc_allow_module_build.patch

    r39348 r39789  
    1 --- a/drivers/staging/zsmalloc/Kconfig 
    2 +++ b/drivers/staging/zsmalloc/Kconfig 
    3 @@ -1,5 +1,5 @@ 
     1--- a/mm/Kconfig 
     2+++ b/mm/Kconfig 
     3@@ -554,7 +554,7 @@ config MEM_SOFT_DIRTY 
     4          See Documentation/vm/soft-dirty.txt for more details. 
     5  
    46 config ZSMALLOC 
    57-       bool "Memory allocator for compressed pages" 
Note: See TracChangeset for help on using the changeset viewer.