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