1602f49b58
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> |
||
|---|---|---|
| .. | ||
| ebt_802_3.c | ||
| ebt_among.c | ||
| ebt_arp.c | ||
| ebt_arpreply.c | ||
| ebt_dnat.c | ||
| ebt_ip6.c | ||
| ebt_ip.c | ||
| ebt_limit.c | ||
| ebt_log.c | ||
| ebt_mark_m.c | ||
| ebt_mark.c | ||
| ebt_nflog.c | ||
| ebt_pkttype.c | ||
| ebt_redirect.c | ||
| ebt_snat.c | ||
| ebt_stp.c | ||
| ebt_vlan.c | ||
| ebtable_broute.c | ||
| ebtable_filter.c | ||
| ebtable_nat.c | ||
| ebtables.c | ||
| Kconfig | ||
| Makefile | ||
| nf_log_bridge.c | ||
| nf_tables_bridge.c | ||
| nft_meta_bridge.c | ||
| nft_reject_bridge.c | ||