tree 29f3740825a70aa606e03cf3a048d9a3a751529c
parent 9333f207920336575cba4ed60603c1cdb79ace4f
parent 48995423143a097527802e28d7add20e5a27677a
author David S. Miller <davem@davemloft.net> 1539972186 -0700
committer David S. Miller <davem@davemloft.net> 1539972186 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

net/sched/cls_api.c has overlapping changes to a call to
nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL
to the 5th argument, and another (from 'net-next') added cb->extack
instead of NULL to the 6th argument.

net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to
code which moved (to mr_table_dump)) in 'net-next'.  Thanks to David
Ahern for the heads up.

Signed-off-by: David S. Miller <davem@davemloft.net>