• David S. Miller's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 2e2d6f03
    David S. Miller authored
    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: default avatarDavid S. Miller <davem@davemloft.net>
    2e2d6f03
ipmr_base.c 9.99 KB