mirror of https://gitee.com/openkylin/linux.git
6b6cbc1471
Conflicts were simply overlapping changes. In the net/ipv4/route.c case the code had simply moved around a little bit and the same fix was made in both 'net' and 'net-next'. In the net/sched/sch_generic.c case a fix in 'net' happened at the same time that a new argument was added to qdisc_hash_add(). Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| team.c | ||
| team_mode_activebackup.c | ||
| team_mode_broadcast.c | ||
| team_mode_loadbalance.c | ||
| team_mode_random.c | ||
| team_mode_roundrobin.c | ||