Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 2 insertions, 2 deletions

diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 98691e1466b8..bd309384f8b8 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -299,7 +299,7 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
         } else if (rule->action == FR_ACT_GOTO)
                 goto errout_free;
 
-        err = ops->configure(rule, skb, nlh, frh, tb);
+        err = ops->configure(rule, skb, frh, tb);
         if (err < 0)
                 goto errout_free;
 
@@ -500,7 +500,7 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule,
         if (rule->target)
                 NLA_PUT_U32(skb, FRA_GOTO, rule->target);
 
-        if (ops->fill(rule, skb, nlh, frh) < 0)
+        if (ops->fill(rule, skb, frh) < 0)
                 goto nla_put_failure;
 
         return nlmsg_end(skb, nlh);