Conflicts:
include/net/inetpeer.h
net/ipv6/output_core.c
Changes in net were fixing bugs in code removed in net-next.
Signed-off-by:
David S. Miller <davem@davemloft.net>
Loading
Please register or sign in to comment
Conflicts:
include/net/inetpeer.h
net/ipv6/output_core.c
Changes in net were fixing bugs in code removed in net-next.
Signed-off-by:
David S. Miller <davem@davemloft.net>