mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 05:31:08 -04: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 <[email protected]>