kernel: bump to 3.14.35, 3.18.9, 3.19.1 and 4.0-rc4

[openwrt/openwrt.git] / target / linux / generic / patches-3.18 / 080-14-fib_trie-Push-assignment-of-child-to-parent-down-int.patch

diff --git a/target/linux/generic/patches-3.18/080-14-fib_trie-Push-assignment-of-child-to-parent-down-int.patch b/target/linux/generic/patches-3.18/080-14-fib_trie-Push-assignment-of-child-to-parent-down-int.patch
index 0e87a7d08ed5d11bd3fd8f957041b56172ba8d73..8f26e32d3d61cf0d053150f1d2db44b5b3a92a52 100644 (file)
--- a/target/linux/generic/patches-3.18/080-14-fib_trie-Push-assignment-of-child-to-parent-down-int.patch
+++ b/target/linux/generic/patches-3.18/080-14-fib_trie-Push-assignment-of-child-to-parent-down-int.patch
@@ -231,7 +231,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        /* No children */
        if (tn->empty_children > (tnode_child_length(tn) - 1))
                goto no_children;
-@@ -755,39 +756,35 @@ static struct tnode *resize(struct trie 
+@@ -755,39 +756,35 @@ static struct tnode *resize(struct trie
         * nonempty nodes that are above the threshold.
         */
        max_work = MAX_WORK;