Changeset 715 for branches


Ignore:
Timestamp:
Dec 6, 2015, 2:03:24 AM (4 years ago)
Author:
ehem
Message:

Patch adjustment, ensure patches apply with no fuzz

The presence of fuzz in patch application is often a Bad Sign(tm).
Adjust patches to ensure application without fuzz. This looks like I may
have fixed a bug with 600-netfilter_layer7_2.22.patch, which it looks
like patch was applying to the wrong place. Remove the message "Support
for Roboswitch not implemented" from bgmac.c, this driver doesn't
implement support, but the SWCONFIG *does* implement support.

Location:
branches/contrib/debian/package-build/linux-patch-openwrt/patches-3.16
Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed
  • branches/contrib/debian/package-build/linux-patch-openwrt/patches-3.16/076-net-phy-export-fixed_phy_register.patch

    r668 r715  
    2121--- a/drivers/net/phy/fixed.c
    2222+++ b/drivers/net/phy/fixed.c
    23 @@ -274,6 +274,7 @@ struct phy_device *fixed_phy_register(un
     23@@ -263,6 +263,7 @@ struct phy_device *fixed_phy_register(un
    2424 
    25         return phy;
     25        return 0;
    2626 }
    2727+EXPORT_SYMBOL_GPL(fixed_phy_register);
  • branches/contrib/debian/package-build/linux-patch-openwrt/patches-3.16/201-extra_optimization.patch

    r668 r715  
    11--- a/Makefile
    22+++ b/Makefile
    3 @@ -612,9 +612,9 @@ include $(srctree)/arch/$(SRCARCH)/Makef
     3@@ -618,9 +618,9 @@ include $(srctree)/arch/$(SRCARCH)/Makef
    44 KBUILD_CFLAGS  += $(call cc-option,-fno-delete-null-pointer-checks,)
    55 
     
    1212 endif
    1313 
    14  # Tell gcc to never replace conditional load with a non-conditional one
     14 NOSTDINC_FLAGS += -nostdinc
  • branches/contrib/debian/package-build/linux-patch-openwrt/patches-3.16/204-module_strip.patch

    r668 r715  
    9494--- a/init/Kconfig
    9595+++ b/init/Kconfig
    96 @@ -1987,6 +1987,13 @@ config MODULE_COMPRESS_XZ
    97  
    98  endchoice
     96@@ -1884,6 +1884,13 @@ config MODULE_COMPRESS_XZ
     97        default "sha384" if MODULE_SIG_SHA384
     98        default "sha512" if MODULE_SIG_SHA512
    9999 
    100100+config MODULE_STRIPPED
     
    110110--- a/kernel/module.c
    111111+++ b/kernel/module.c
    112 @@ -2665,6 +2665,7 @@ static struct module *setup_load_info(st
     112@@ -2669,6 +2669,7 @@ static struct module *setup_load_info(st
    113113 
    114114 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
     
    118118        int err;
    119119 
    120 @@ -2690,6 +2691,7 @@ static int check_modinfo(struct module *
     120@@ -2694,6 +2695,7 @@ static int check_modinfo(struct module *
    121121                pr_warn("%s: module is from the staging directory, the quality "
    122122                        "is unknown, you have been warned.\n", mod->name);
     
    128128--- a/scripts/mod/modpost.c
    129129+++ b/scripts/mod/modpost.c
    130 @@ -1726,7 +1726,9 @@ static void read_symbols(char *modname)
     130@@ -1755,7 +1755,9 @@ static void read_symbols(char *modname)
    131131                symname = remove_dot(info.strtab + sym->st_name);
    132132 
     
    138138        if (!is_vmlinux(modname) ||
    139139             (is_vmlinux(modname) && vmlinux_section_warnings))
    140 @@ -1870,7 +1872,9 @@ static void add_header(struct buffer *b,
     140@@ -1899,7 +1901,9 @@ static void add_header(struct buffer *b,
    141141        buf_printf(b, "#include <linux/vermagic.h>\n");
    142142        buf_printf(b, "#include <linux/compiler.h>\n");
     
    148148        buf_printf(b, "__visible struct module __this_module\n");
    149149        buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
    150 @@ -1887,16 +1891,20 @@ static void add_header(struct buffer *b,
     150@@ -1916,16 +1920,20 @@ static void add_header(struct buffer *b,
    151151 
    152152 static void add_intree_flag(struct buffer *b, int is_intree)
     
    169169 
    170170 /**
    171 @@ -1989,11 +1997,13 @@ static void add_depends(struct buffer *b
     171@@ -2018,11 +2024,13 @@ static void add_depends(struct buffer *b
    172172 
    173173 static void add_srcversion(struct buffer *b, struct module *mod)
     
    183183 
    184184 static void write_if_changed(struct buffer *b, const char *fname)
    185 @@ -2224,7 +2234,9 @@ int main(int argc, char **argv)
     185@@ -2253,7 +2263,9 @@ int main(int argc, char **argv)
    186186                add_staging_flag(&buf, mod->name);
    187187                err |= add_versions(&buf, mod);
  • branches/contrib/debian/package-build/linux-patch-openwrt/patches-3.16/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch

    r668 r715  
    1111--- a/drivers/mtd/spi-nor/spi-nor.c
    1212+++ b/drivers/mtd/spi-nor/spi-nor.c
    13 @@ -616,6 +616,7 @@ static const struct spi_device_id spi_no
    14         { "m25px80",    INFO(0x207114,  0, 64 * 1024, 16, 0) },
     13@@ -566,6 +566,7 @@ static const struct spi_device_id spi_no
     14        { "m25px64",    INFO(0x207117,  0, 64 * 1024, 128, 0) },
    1515 
    1616        /* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
  • branches/contrib/debian/package-build/linux-patch-openwrt/patches-3.16/600-netfilter_layer7_2.22.patch

    r668 r715  
    11--- a/net/netfilter/Kconfig
    22+++ b/net/netfilter/Kconfig
    3 @@ -1357,6 +1357,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 @@ -161,6 +161,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 @@ -220,6 +220,13 @@ destroy_conntrack(struct nf_conntrack *n
    2063          * too. */
     2062@@ -313,6 +313,13 @@ destroy_conntrack(struct nf_conntrack *n
     2063         */
    20642064        nf_ct_remove_expectations(ct);
    20652065 
     
    20712071+#endif
    20722072+
    2073         /* We overload first tuple to link into unconfirmed or dying list.*/
    2074         BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode));
    2075         hlist_nulls_del_rcu(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode);
     2073        nf_ct_del_from_dying_or_unconfirmed_list(ct);
     2074 
     2075        NF_CT_STAT_INC(net, delete);
    20762076--- a/net/netfilter/nf_conntrack_standalone.c
    20772077+++ b/net/netfilter/nf_conntrack_standalone.c
     
    20912091--- a/include/net/netfilter/nf_conntrack.h
    20922092+++ b/include/net/netfilter/nf_conntrack.h
    2093 @@ -105,6 +105,22 @@ struct nf_conn {
     2093@@ -112,6 +112,22 @@ struct nf_conn {
    20942094        struct net *ct_net;
    20952095 #endif
  • branches/contrib/debian/package-build/linux-patch-openwrt/patches-3.16/644-bridge_optimize_netfilter_hooks.patch

    r668 r715  
    11--- a/net/bridge/br_forward.c
    22+++ b/net/bridge/br_forward.c
    3 @@ -53,7 +53,7 @@ EXPORT_SYMBOL_GPL(br_dev_queue_push_xmit
     3@@ -52,7 +52,7 @@ EXPORT_SYMBOL_GPL(br_dev_queue_push_xmit
    44 
    55 int br_forward_finish(struct sk_buff *skb)
     
    1010 
    1111 }
    12 @@ -77,7 +77,7 @@ static void __br_deliver(const struct ne
     12@@ -75,7 +75,7 @@ static void __br_deliver(const struct ne
    1313                return;
    1414        }
     
    1919 }
    2020 
    21 @@ -98,7 +98,7 @@ static void __br_forward(const struct ne
     21@@ -96,7 +96,7 @@ static void __br_forward(const struct ne
    2222        skb->dev = to->dev;
    2323        skb_forward_csum(skb);
     
    3939 }
    4040 
    41 @@ -219,7 +219,7 @@ rx_handler_result_t br_handle_frame(stru
     41@@ -218,7 +218,7 @@ rx_handler_result_t br_handle_frame(stru
    4242                }
    4343 
     
    4848                        return RX_HANDLER_CONSUMED; /* consumed by filter */
    4949                } else {
    50 @@ -234,7 +234,7 @@ forward:
     50@@ -233,7 +233,7 @@ forward:
    5151                if (ether_addr_equal(p->br->dev->dev_addr, dest))
    5252                        skb->pkt_type = PACKET_HOST;
     
    5757                        break;
    5858 
    59 @@ -256,7 +256,7 @@ forward:
     59@@ -255,7 +255,7 @@ forward:
    6060                if (ether_addr_equal(p->br->dev->dev_addr, dest))
    6161                        skb->pkt_type = PACKET_HOST;
     
    9797--- a/net/bridge/br_private.h
    9898+++ b/net/bridge/br_private.h
    99 @@ -778,6 +778,24 @@ static inline void br_nf_core_fini(void)
     99@@ -765,6 +765,24 @@ static inline void br_nf_core_fini(void)
    100100 #define br_netfilter_rtable_init(x)
    101101 #endif
     
    121121 /* br_stp.c */
    122122 void br_log_state(const struct net_bridge_port *p);
    123  void br_set_state(struct net_bridge_port *p, unsigned int state);
     123 struct net_bridge_port *br_get_port(struct net_bridge *br, u16 port_no);
    124124--- a/net/bridge/br_stp_bpdu.c
    125125+++ b/net/bridge/br_stp_bpdu.c
     
    135135--- a/net/bridge/netfilter/ebtables.c
    136136+++ b/net/bridge/netfilter/ebtables.c
    137 @@ -2414,11 +2414,19 @@ static int __init ebtables_init(void)
     137@@ -2405,11 +2405,19 @@ static int __init ebtables_init(void)
    138138        }
    139139 
  • branches/contrib/debian/package-build/linux-patch-openwrt/patches-3.16/726-phy_rtl8366.patch

    r668 r715  
    11--- a/drivers/net/phy/Kconfig
    22+++ b/drivers/net/phy/Kconfig
    3 @@ -250,6 +250,30 @@ config MDIO_BCM_UNIMAC
    4           controllers as well as some Broadcom Ethernet switches such as the
    5           Starfighter 2 switches.
     3@@ -243,6 +243,30 @@ config MDIO_BCM_UNIMAC
     4 
     5          Currently, only 8-bit registers are supported.
    66 
    77+config RTL8366_SMI
  • branches/contrib/debian/package-build/linux-patch-openwrt/patches-3.16/775-bgmac-check-length-of-received-frame.patch

    r668 r715  
    1010--- a/drivers/net/ethernet/broadcom/bgmac.c
    1111+++ b/drivers/net/ethernet/broadcom/bgmac.c
    12 @@ -363,6 +363,27 @@ static int bgmac_dma_rx_read(struct bgma
    13                         dma_addr_t old_dma_addr = slot->dma_addr;
    14                         int err;
     12@@ -448,6 +448,27 @@ static int bgmac_dma_rx_read(struct bgma
     13                        len = le16_to_cpu(rx->len);
     14                        flags = le16_to_cpu(rx->flags);
    1515 
    1616+                       if (len > BGMAC_RX_MAX_FRAME_SIZE) {
  • branches/contrib/debian/package-build/linux-patch-openwrt/patches-3.16/902-debloat_proc.patch

    r668 r715  
    11--- a/fs/locks.c
    22+++ b/fs/locks.c
    3 @@ -2611,6 +2611,8 @@ static const struct file_operations proc
     3@@ -2559,6 +2559,8 @@ static const struct file_operations proc
    44 
    55 static int __init proc_locks_init(void)
     
    6666        if (!proc_mkdir("tty", NULL))
    6767                return;
    68         proc_mkdir("tty/ldisc", NULL);  /* Preserved: it's userspace visible */
     68        proc_tty_ldisc = proc_mkdir("tty/ldisc", NULL);
    6969--- a/kernel/exec_domain.c
    7070+++ b/kernel/exec_domain.c
     
    123123--- a/mm/vmalloc.c
    124124+++ b/mm/vmalloc.c
    125 @@ -2662,6 +2662,8 @@ static const struct file_operations proc
     125@@ -2674,6 +2674,8 @@ static const struct file_operations proc
    126126 
    127127 static int __init proc_vmalloc_init(void)
     
    134134--- a/mm/vmstat.c
    135135+++ b/mm/vmstat.c
    136 @@ -1424,10 +1424,12 @@ static int __init setup_vmstat(void)
     136@@ -1314,10 +1314,12 @@ static int __init setup_vmstat(void)
    137137        cpu_notifier_register_done();
    138138 #endif
     
    174174--- a/net/core/sock.c
    175175+++ b/net/core/sock.c
    176 @@ -2915,6 +2915,8 @@ static __net_initdata struct pernet_oper
     176@@ -3004,6 +3004,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 @@ -524,6 +524,9 @@ static __net_initdata struct pernet_oper
     230@@ -523,6 +523,9 @@ static __net_initdata struct pernet_oper
    231231 
    232232 int __init ip_misc_proc_init(void)
  • branches/contrib/debian/package-build/linux-patch-openwrt/patches-3.16/903-debloat_direct_io.patch

    r668 r715  
    11--- a/fs/Kconfig
    22+++ b/fs/Kconfig
    3 @@ -62,6 +62,11 @@ config FILE_LOCKING
     3@@ -61,6 +61,11 @@ config FILE_LOCKING
    44           for filesystems like NFS and for the flock() system
    55           call. Disabling this option saves about 11k.
     
    1616+++ b/fs/Makefile
    1717@@ -14,7 +14,8 @@ obj-y :=      open.o read_write.o file_table.
    18                 stack.o fs_struct.o statfs.o fs_pin.o
     18                stack.o fs_struct.o statfs.o
    1919 
    2020 ifeq ($(CONFIG_BLOCK),y)
     
    2727--- a/include/linux/fs.h
    2828+++ b/include/linux/fs.h
    29 @@ -2530,12 +2530,25 @@ enum {
     29@@ -2527,12 +2527,25 @@ enum {
    3030        DIO_ASYNC_EXTEND = 0x04,
    3131 };
     
    6868--- a/fs/open.c
    6969+++ b/fs/open.c
    70 @@ -655,9 +655,12 @@ int open_check_o_direct(struct file *f)
     70@@ -657,9 +657,12 @@ int open_check_o_direct(struct file *f)
    7171 {
    7272        /* NB: we're sure to have correct a_ops only after f_op->open */
  • branches/contrib/debian/package-build/linux-patch-openwrt/patches-3.16/930-crashlog.patch

    r668 r715  
    2121--- a/init/Kconfig
    2222+++ b/init/Kconfig
    23 @@ -1279,6 +1279,10 @@ config RELAY
     23@@ -1243,6 +1243,10 @@ config RELAY
    2424 
    2525          If unsure, say N.
     
    234234+#include <linux/crashlog.h>
    235235 #include <linux/memblock.h>
    236  #include <linux/bug.h>
    237  #include <linux/io.h>
     236 
     237 #include <asm/bug.h>
    238238@@ -177,6 +178,7 @@ static unsigned long __init free_all_boo
    239239        if (!bdata->node_bootmem_map)
     
    246246--- a/kernel/module.c
    247247+++ b/kernel/module.c
    248 @@ -105,6 +105,9 @@ static LIST_HEAD(modules);
     248@@ -106,6 +106,9 @@ static LIST_HEAD(modules);
    249249 #ifdef CONFIG_KGDB_KDB
    250250 struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
Note: See TracChangeset for help on using the changeset viewer.