mirror of
https://github.com/torvalds/linux
synced 2024-10-01 17:00:41 +00:00
36583eb54d
Conflicts: drivers/net/ethernet/cadence/macb.c drivers/net/phy/phy.c include/linux/skbuff.h net/ipv4/tcp.c net/switchdev/switchdev.c Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD} renaming overlapping with net-next changes of various sorts. phy.c was a case of two changes, one adding a local variable to a function whilst the second was removing one. tcp.c overlapped a deadlock fix with the addition of new tcp_info statistic values. macb.c involved the addition of two zyncq device entries. skbuff.h involved adding back ipv4_daddr to nf_bridge_info whilst net-next changes put two other existing members of that struct into a union. 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_ip.c | ||
ebt_ip6.c | ||
ebt_limit.c | ||
ebt_log.c | ||
ebt_mark.c | ||
ebt_mark_m.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 |