Merge remote-tracking branch 'net-next/master' into mac80211-next

Resolve the merge conflict between Felix's/my and Toke's patches coming into the tree through net and mac80211-next respectively. Most of Felix's changes go away due to Toke's new infrastructure work, my patch changes to "goto begin" (the label wasn't there before) instead of returning NULL so flow control towards drivers is preserved better. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2026-11-13 07:31:07 +00:00 · 2016-10-04 09:22:19 +02:00 · 2016-10-04 09:22:19 +02:00 · 1e1430d528
commit 1e1430d528
parent bb42f2d13f 9a8dd213d2
1014 changed files with 35819 additions and 11407 deletions
--- a/net/6lowpan/ndisc.c
+++ b/net/6lowpan/ndisc.c
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
--- a/net/bluetooth/hci_request.h
+++ b/net/bluetooth/hci_request.h
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
--- a/net/bluetooth/leds.c
+++ b/net/bluetooth/leds.c
--- a/net/bluetooth/leds.h
+++ b/net/bluetooth/leds.h
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
--- a/net/bluetooth/mgmt_util.c
+++ b/net/bluetooth/mgmt_util.c
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
--- a/net/bridge/br_netfilter_hooks.c
+++ b/net/bridge/br_netfilter_hooks.c
--- a/net/bridge/br_netfilter_ipv6.c
+++ b/net/bridge/br_netfilter_ipv6.c
--- a/net/bridge/netfilter/ebt_log.c
+++ b/net/bridge/netfilter/ebt_log.c
--- a/net/bridge/netfilter/ebt_redirect.c
+++ b/net/bridge/netfilter/ebt_redirect.c
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
--- a/net/bridge/netfilter/nf_tables_bridge.c
+++ b/net/bridge/netfilter/nf_tables_bridge.c
--- a/net/bridge/netfilter/nft_reject_bridge.c
+++ b/net/bridge/netfilter/nft_reject_bridge.c
--- a/net/core/dev.c
+++ b/net/core/dev.c
--- a/net/core/filter.c
+++ b/net/core/filter.c
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
--- a/net/core/sock.c
+++ b/net/core/sock.c
--- a/net/core/stream.c
+++ b/net/core/stream.c
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
--- a/net/ipv4/Makefile
+++ b/net/ipv4/Makefile
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
--- a/net/ipv4/gre_offload.c
+++ b/net/ipv4/gre_offload.c
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
--- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
+++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
--- a/net/ipv4/netfilter/nf_log_arp.c
+++ b/net/ipv4/netfilter/nf_log_arp.c
--- a/net/ipv4/netfilter/nf_log_ipv4.c
+++ b/net/ipv4/netfilter/nf_log_ipv4.c
--- a/net/ipv4/netfilter/nf_nat_proto_gre.c
+++ b/net/ipv4/netfilter/nf_nat_proto_gre.c
--- a/net/ipv4/netfilter/nf_tables_arp.c
+++ b/net/ipv4/netfilter/nf_tables_arp.c
--- a/net/ipv4/netfilter/nf_tables_ipv4.c
+++ b/net/ipv4/netfilter/nf_tables_ipv4.c
--- a/net/ipv4/netfilter/nft_chain_route_ipv4.c
+++ b/net/ipv4/netfilter/nft_chain_route_ipv4.c
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
--- a/net/ipv4/tcp_bbr.c
+++ b/net/ipv4/tcp_bbr.c
--- a/net/ipv4/tcp_cdg.c
+++ b/net/ipv4/tcp_cdg.c
--- a/net/ipv4/tcp_cong.c
+++ b/net/ipv4/tcp_cong.c
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
--- a/net/ipv4/tcp_offload.c
+++ b/net/ipv4/tcp_offload.c
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
--- a/net/ipv4/tcp_rate.c
+++ b/net/ipv4/tcp_rate.c
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
--- a/net/ipv6/netfilter/nf_log_ipv6.c
+++ b/net/ipv6/netfilter/nf_log_ipv6.c
--- a/net/ipv6/netfilter/nf_tables_ipv6.c
+++ b/net/ipv6/netfilter/nf_tables_ipv6.c
--- a/net/ipv6/netfilter/nft_chain_route_ipv6.c
+++ b/net/ipv6/netfilter/nft_chain_route_ipv6.c
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
--- a/net/ipv6/xfrm6_input.c
+++ b/net/ipv6/xfrm6_input.c
--- a/net/ipv6/xfrm6_tunnel.c
+++ b/net/ipv6/xfrm6_tunnel.c
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
--- a/net/mac802154/rx.c
+++ b/net/mac802154/rx.c
--- a/net/mpls/internal.h
+++ b/net/mpls/internal.h
--- a/net/ncsi/internal.h
+++ b/net/ncsi/internal.h
--- a/net/ncsi/ncsi-aen.c
+++ b/net/ncsi/ncsi-aen.c
--- a/net/ncsi/ncsi-cmd.c
+++ b/net/ncsi/ncsi-cmd.c
--- a/net/ncsi/ncsi-manage.c
+++ b/net/ncsi/ncsi-manage.c
--- a/net/ncsi/ncsi-rsp.c
+++ b/net/ncsi/ncsi-rsp.c
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
--- a/Show more
+++ b/Show more