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

This brings in commit 7a7c0a6438 ("mac80211: fix TX aggregation start/stop callback race") to allow the follow-up cleanup. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2026-11-13 07:31:07 +00:00 · 2017-06-08 14:14:40 +02:00 · 2017-06-08 14:14:40 +02:00 · a43e61842e
commit a43e61842e
parent 5d473fedd1 50dffe7fad
1515 changed files with 46392 additions and 23199 deletions
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
--- a/include/linux/avf/virtchnl.h
+++ b/include/linux/avf/virtchnl.h
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
--- a/include/linux/ceph/ceph_debug.h
+++ b/include/linux/ceph/ceph_debug.h
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
--- a/include/linux/compiler-clang.h
+++ b/include/linux/compiler-clang.h
--- a/include/linux/dax.h
+++ b/include/linux/dax.h
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
--- a/include/linux/gpio/machine.h
+++ b/include/linux/gpio/machine.h
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
--- a/include/linux/if_tap.h
+++ b/include/linux/if_tap.h
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
--- a/include/linux/micrel_phy.h
+++ b/include/linux/micrel_phy.h
--- a/include/linux/mii.h
+++ b/include/linux/mii.h
--- a/include/linux/mlx4/qp.h
+++ b/include/linux/mlx4/qp.h
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
--- a/include/linux/mlx5/mlx5_ifc_fpga.h
+++ b/include/linux/mlx5/mlx5_ifc_fpga.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
--- a/include/linux/netfilter_bridge/ebtables.h
+++ b/include/linux/netfilter_bridge/ebtables.h
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
--- a/include/linux/nvme-fc-driver.h
+++ b/include/linux/nvme-fc-driver.h
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
--- a/include/linux/pinctrl/pinconf-generic.h
+++ b/include/linux/pinctrl/pinconf-generic.h
--- a/include/linux/platform_data/microchip-ksz.h
+++ b/include/linux/platform_data/microchip-ksz.h
--- a/include/linux/ptr_ring.h
+++ b/include/linux/ptr_ring.h
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
--- a/include/linux/qed/common_hsi.h
+++ b/include/linux/qed/common_hsi.h
--- a/include/linux/qed/eth_common.h
+++ b/include/linux/qed/eth_common.h
--- a/include/linux/qed/fcoe_common.h
+++ b/include/linux/qed/fcoe_common.h
--- a/include/linux/qed/iscsi_common.h
+++ b/include/linux/qed/iscsi_common.h
--- a/include/linux/qed/qed_eth_if.h
+++ b/include/linux/qed/qed_eth_if.h
--- a/include/linux/qed/qed_fcoe_if.h
+++ b/include/linux/qed/qed_fcoe_if.h
--- a/include/linux/qed/qed_if.h
+++ b/include/linux/qed/qed_if.h
--- a/include/linux/qed/qed_iscsi_if.h
+++ b/include/linux/qed/qed_iscsi_if.h
--- a/include/linux/qed/rdma_common.h
+++ b/include/linux/qed/rdma_common.h
--- a/include/linux/qed/roce_common.h
+++ b/include/linux/qed/roce_common.h
--- a/include/linux/qed/tcp_common.h
+++ b/include/linux/qed/tcp_common.h
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
--- a/include/linux/rxrpc.h
+++ b/include/linux/rxrpc.h
--- a/include/linux/serdev.h
+++ b/include/linux/serdev.h
--- a/include/linux/skb_array.h
+++ b/include/linux/skb_array.h
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/linux/soc/renesas/rcar-rst.h
+++ b/include/linux/soc/renesas/rcar-rst.h
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
--- a/include/media/cec-notifier.h
+++ b/include/media/cec-notifier.h
--- a/include/media/cec.h
+++ b/include/media/cec.h
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
--- a/include/net/bond_options.h
+++ b/include/net/bond_options.h
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
--- a/include/net/dst.h
+++ b/include/net/dst.h
--- a/include/net/flow_dissector.h
+++ b/include/net/flow_dissector.h
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
--- a/include/net/lwtunnel.h
+++ b/include/net/lwtunnel.h
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
--- a/include/net/netfilter/nf_conntrack_helper.h
+++ b/include/net/netfilter/nf_conntrack_helper.h
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
--- a/include/net/request_sock.h
+++ b/include/net/request_sock.h
--- a/include/net/route.h
+++ b/include/net/route.h
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
--- a/include/net/tc_act/tc_csum.h
+++ b/include/net/tc_act/tc_csum.h
--- a/include/net/tc_act/tc_gact.h
+++ b/include/net/tc_act/tc_gact.h
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
--- a/include/net/x25.h
+++ b/include/net/x25.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
--- a/include/rdma/ib_sa.h
+++ b/include/rdma/ib_sa.h
--- a/include/rdma/rdma_netlink.h
+++ b/include/rdma/rdma_netlink.h
--- a/include/rxrpc/packet.h
+++ b/include/rxrpc/packet.h
--- a/Show more
+++ b/Show more