mirror of
https://github.com/ukui/kernel.git
synced 2026-03-09 10:07:04 -07:00
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>