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> |
||
---|---|---|
.. | ||
bnxt_re | ||
cxgb3 | ||
cxgb4 | ||
hfi1 | ||
hns | ||
i40iw | ||
mlx4 | ||
mlx5 | ||
mthca | ||
nes | ||
ocrdma | ||
qedr | ||
qib | ||
usnic | ||
vmw_pvrdma | ||
Makefile |