mirror of
https://gitee.com/openharmony/kernel_linux
synced 2025-05-27 17:17:34 +00:00

Conflicts were two cases of simple overlapping changes, nothing serious. In the UDP case, we need to add a hlist_add_tail_rcu() to linux/rculist.h, because we've moved UDP socket handling away from using nulls lists. Signed-off-by: David S. Miller <davem@davemloft.net>