2e2d6f0342
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> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| ocelot.c | ||
| ocelot.h | ||
| ocelot_ana.h | ||
| ocelot_board.c | ||
| ocelot_dev.h | ||
| ocelot_io.c | ||
| ocelot_qs.h | ||
| ocelot_qsys.h | ||
| ocelot_regs.c | ||
| ocelot_rew.h | ||
| ocelot_sys.h | ||