mirror of https://gitee.com/openkylin/linux.git
6f41617bf2
Minor conflict in net/core/rtnetlink.c, David Ahern's bug fix in 'net' overlapped the renaming of a netlink attribute in net-next. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
Makefile | ||
common.h | ||
hash.c | ||
interface.c | ||
netback.c | ||
rx.c | ||
xenbus.c |