lkml.org 
[lkml]   [2015]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the net-next tree with the net tree
    Hi all,

    Today's linux-next merge of the net-next tree got a conflict in
    net/core/fib_rules.c between commit 419df12fb5fa ("net: move
    fib_rules_unregister() under rtnl lock") from the net tree and commit
    efd7ef1c1929 ("net: Kill hold_net release_net") from the net-next tree.

    I fixed it up (see below) and can carry the fix as necessary (no action
    is required).

    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au

    diff --cc net/core/fib_rules.c
    index e4fdc9dfb2c7,68ea6950cad1..000000000000
    --- a/net/core/fib_rules.c
    +++ b/net/core/fib_rules.c
    @@@ -175,10 -165,10 +165,10 @@@ void fib_rules_unregister(struct fib_ru

    spin_lock(&net->rules_mod_lock);
    list_del_rcu(&ops->list);
    - fib_rules_cleanup_ops(ops);
    spin_unlock(&net->rules_mod_lock);

    + fib_rules_cleanup_ops(ops);
    - call_rcu(&ops->rcu, fib_rules_put_rcu);
    + kfree_rcu(ops, rcu);
    }
    EXPORT_SYMBOL_GPL(fib_rules_unregister);

    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2015-04-07 06:01    [W:5.668 / U:0.880 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site