kernel: refresh 3.12 patches on -rc7 release

Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38572 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic/patches-3.12/100-overlayfs.patch b/target/linux/generic/patches-3.12/100-overlayfs.patch
index 2e9e023..6f3ea9b 100644 (file)
--- a/target/linux/generic/patches-3.12/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.12/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
-@@ -6230,6 +6230,13 @@ F:      drivers/scsi/osd/
+@@ -6245,6 +6245,13 @@ F:      drivers/scsi/osd/
  F:    include/scsi/osd_*
  F:    fs/exofs/
  
@@ -326,7 +326,7 @@
  
  /**
   * sb_permission - Check superblock-level permissions
-@@ -3063,9 +3064,12 @@ finish_open_created:
+@@ -3064,9 +3065,12 @@ finish_open_created:
        error = may_open(&nd->path, acc_mode, open_flag);
        if (error)
                goto out;

diff --git a/target/linux/generic/patches-3.12/642-bridge_port_isolate.patch b/target/linux/generic/patches-3.12/642-bridge_port_isolate.patch
index 1d6b75c..be9b8f1 100644 (file)
--- a/target/linux/generic/patches-3.12/642-bridge_port_isolate.patch
+++ b/target/linux/generic/patches-3.12/642-bridge_port_isolate.patch
@@ -1,6 +1,6 @@
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
-@@ -174,6 +174,7 @@ struct net_bridge_port
+@@ -173,6 +173,7 @@ struct net_bridge_port
  #define BR_ADMIN_COST         0x00000010
  #define BR_LEARNING           0x00000020
  #define BR_FLOOD              0x00000040

diff --git a/target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch
index b657981..85def08 100644 (file)
--- a/target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch
+++ b/target/linux/generic/patches-3.12/644-bridge_optimize_netfilter_hooks.patch
@@ -67,7 +67,7 @@
        default:
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
-@@ -799,7 +799,7 @@ static void __br_multicast_send_query(st
+@@ -802,7 +802,7 @@ static void __br_multicast_send_query(st
        if (port) {
                __skb_push(skb, sizeof(struct ethhdr));
                skb->dev = port->dev;
@@ -96,7 +96,7 @@
        if (vlan_tx_tag_present(skb))
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
-@@ -728,15 +728,29 @@ static inline u16 br_get_pvid(const stru
+@@ -725,15 +725,29 @@ static inline u16 br_get_pvid(const stru
  
  /* br_netfilter.c */
  #ifdef CONFIG_BRIDGE_NETFILTER

diff --git a/target/linux/generic/patches-3.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/patches-3.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
index 5d52040..64b2b37 100644 (file)
--- a/target/linux/generic/patches-3.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
+++ b/target/linux/generic/patches-3.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@ -127,7 +127,7 @@
  static const struct rt6_info ip6_blk_hole_entry_template = {
        .dst = {
                .__refcnt       = ATOMIC_INIT(1),
-@@ -1553,6 +1571,9 @@ int ip6_route_add(struct fib6_config *cf
+@@ -1577,6 +1595,9 @@ int ip6_route_add(struct fib6_config *cf
                case RTN_THROW:
                        rt->dst.error = -EAGAIN;
                        break;
@@ -137,7 +137,7 @@
                default:
                        rt->dst.error = -ENETUNREACH;
                        break;
-@@ -2129,6 +2150,17 @@ static int ip6_pkt_prohibit_out(struct s
+@@ -2156,6 +2177,17 @@ static int ip6_pkt_prohibit_out(struct s
        return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
  }
  
@@ -155,7 +155,7 @@
  #endif
  
  /*
-@@ -2334,7 +2366,8 @@ static int rtm_to_fib6_config(struct sk_
+@@ -2362,7 +2394,8 @@ static int rtm_to_fib6_config(struct sk_
        if (rtm->rtm_type == RTN_UNREACHABLE ||
            rtm->rtm_type == RTN_BLACKHOLE ||
            rtm->rtm_type == RTN_PROHIBIT ||
@@ -165,7 +165,7 @@
                cfg->fc_flags |= RTF_REJECT;
  
        if (rtm->rtm_type == RTN_LOCAL)
-@@ -2536,6 +2569,9 @@ static int rt6_fill_node(struct net *net
+@@ -2564,6 +2597,9 @@ static int rt6_fill_node(struct net *net
                case -EACCES:
                        rtm->rtm_type = RTN_PROHIBIT;
                        break;
@@ -175,7 +175,7 @@
                case -EAGAIN:
                        rtm->rtm_type = RTN_THROW;
                        break;
-@@ -2786,6 +2822,8 @@ static int ip6_route_dev_notify(struct n
+@@ -2814,6 +2850,8 @@ static int ip6_route_dev_notify(struct n
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
                net->ipv6.ip6_prohibit_entry->dst.dev = dev;
                net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@ -184,7 +184,7 @@
                net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
                net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
  #endif
-@@ -3046,6 +3084,17 @@ static int __net_init ip6_route_net_init
+@@ -3074,6 +3112,17 @@ static int __net_init ip6_route_net_init
        net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
        dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
                         ip6_template_metrics, true);
@@ -202,7 +202,7 @@
  #endif
  
        net->ipv6.sysctl.flush_delay = 0;
-@@ -3064,6 +3113,8 @@ out:
+@@ -3092,6 +3141,8 @@ out:
        return ret;
  
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -211,7 +211,7 @@
  out_ip6_prohibit_entry:
        kfree(net->ipv6.ip6_prohibit_entry);
  out_ip6_null_entry:
-@@ -3081,6 +3132,7 @@ static void __net_exit ip6_route_net_exi
+@@ -3109,6 +3160,7 @@ static void __net_exit ip6_route_net_exi
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
        kfree(net->ipv6.ip6_prohibit_entry);
        kfree(net->ipv6.ip6_blk_hole_entry);
@@ -219,7 +219,7 @@
  #endif
        dst_entries_destroy(&net->ipv6.ip6_dst_ops);
  }
-@@ -3177,6 +3229,9 @@ int __init ip6_route_init(void)
+@@ -3205,6 +3257,9 @@ int __init ip6_route_init(void)
        init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
        init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
        init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);

diff --git a/target/linux/generic/patches-3.12/721-phy_packets.patch b/target/linux/generic/patches-3.12/721-phy_packets.patch
index 8002bdf..9a1c011 100644 (file)
--- a/target/linux/generic/patches-3.12/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.12/721-phy_packets.patch
@@ -79,7 +79,7 @@
        help
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -2601,9 +2601,19 @@ int dev_hard_start_xmit(struct sk_buff *
+@@ -2602,9 +2602,19 @@ int dev_hard_start_xmit(struct sk_buff *
                if (!list_empty(&ptype_all))
                        dev_queue_xmit_nit(skb, dev);
  
@@ -102,7 +102,7 @@
                if (rc == NETDEV_TX_OK)
                        txq_trans_update(txq);
                return rc;
-@@ -2619,9 +2629,19 @@ gso:
+@@ -2620,9 +2630,19 @@ gso:
                if (!list_empty(&ptype_all))
                        dev_queue_xmit_nit(nskb, dev);
  

diff --git a/target/linux/generic/patches-3.12/863-gpiommc.patch b/target/linux/generic/patches-3.12/863-gpiommc.patch
index 684dc42..f472527 100644 (file)
--- a/target/linux/generic/patches-3.12/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.12/863-gpiommc.patch
@@ -830,7 +830,7 @@
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3813,6 +3813,11 @@ L:      linuxppc-dev@lists.ozlabs.org
+@@ -3825,6 +3825,11 @@ L:      linuxppc-dev@lists.ozlabs.org
  S:    Odd Fixes
  F:    drivers/tty/hvc/
  

diff --git a/target/linux/generic/patches-3.12/902-debloat_proc.patch b/target/linux/generic/patches-3.12/902-debloat_proc.patch
index 6f83353..a58fc4b 100644 (file)
--- a/target/linux/generic/patches-3.12/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.12/902-debloat_proc.patch
@@ -173,7 +173,7 @@
                goto err;
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -2932,6 +2932,8 @@ static __net_initdata struct pernet_oper
+@@ -2933,6 +2933,8 @@ static __net_initdata struct pernet_oper
  
  static int __init proto_init(void)
  {