Merge remote-tracking branch 'wireless/main' into wireless-next

Pull in wireless/main content since some new code would otherwise conflict with it. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2026-11-10 20:48:12 +00:00 · 2022-10-10 11:03:31 +02:00 · 2022-10-10 11:03:31 +02:00 · dfd2d876b3
commit dfd2d876b3
parent a790cc3a4f 10d5ea5a43
1241 changed files with 51223 additions and 14672 deletions
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
--- a/include/acpi/cppc_acpi.h
+++ b/include/acpi/cppc_acpi.h
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/linux/a.out.h
+++ b/include/linux/a.out.h
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
--- a/include/linux/bpf_types.h
+++ b/include/linux/bpf_types.h
--- a/include/linux/bpf_verifier.h
+++ b/include/linux/bpf_verifier.h
--- a/include/linux/btf.h
+++ b/include/linux/btf.h
--- a/include/linux/cfi.h
+++ b/include/linux/cfi.h
--- a/include/linux/cfi_types.h
+++ b/include/linux/cfi_types.h
--- a/include/linux/compiler-clang.h
+++ b/include/linux/compiler-clang.h
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
--- a/include/linux/dlm.h
+++ b/include/linux/dlm.h
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
--- a/include/linux/fortify-string.h
+++ b/include/linux/fortify-string.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/fscrypt.h
+++ b/include/linux/fscrypt.h
--- a/include/linux/init.h
+++ b/include/linux/init.h
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
--- a/include/linux/key.h
+++ b/include/linux/key.h
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
--- a/include/linux/lsm_hook_defs.h
+++ b/include/linux/lsm_hook_defs.h
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
--- a/include/linux/mdio/mdio-i2c.h
+++ b/include/linux/mdio/mdio-i2c.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/module.h
+++ b/include/linux/module.h
--- a/include/linux/once.h
+++ b/include/linux/once.h
--- a/include/linux/overflow.h
+++ b/include/linux/overflow.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
--- a/include/linux/platform_data/tps68470.h
+++ b/include/linux/platform_data/tps68470.h
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
--- a/include/linux/posix_acl_xattr.h
+++ b/include/linux/posix_acl_xattr.h
--- a/include/linux/pse-pd/pse.h
+++ b/include/linux/pse-pd/pse.h
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
--- a/include/linux/rcutiny.h
+++ b/include/linux/rcutiny.h
--- a/include/linux/rcutree.h
+++ b/include/linux/rcutree.h
--- a/include/linux/resctrl.h
+++ b/include/linux/resctrl.h
--- a/include/linux/security.h
+++ b/include/linux/security.h
--- a/include/linux/sfp.h
+++ b/include/linux/sfp.h
--- a/include/linux/srcutiny.h
+++ b/include/linux/srcutiny.h
--- a/include/linux/stat.h
+++ b/include/linux/stat.h
--- a/include/linux/string.h
+++ b/include/linux/string.h
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
--- a/include/linux/verification.h
+++ b/include/linux/verification.h
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
--- a/include/net/bluetooth/hci_sync.h
+++ b/include/net/bluetooth/hci_sync.h
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
--- a/include/net/dst_metadata.h
+++ b/include/net/dst_metadata.h
--- a/include/net/flow.h
+++ b/include/net/flow.h
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
--- a/include/net/ipcomp.h
+++ b/include/net/ipcomp.h
--- a/include/net/netfilter/nf_conntrack_bpf.h
+++ b/include/net/netfilter/nf_conntrack_bpf.h
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
--- a/include/net/xsk_buff_pool.h
+++ b/include/net/xsk_buff_pool.h
--- a/include/trace/events/dlm.h
+++ b/include/trace/events/dlm.h
--- a/include/trace/events/erofs.h
+++ b/include/trace/events/erofs.h
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
--- a/include/uapi/linux/dlm.h
+++ b/include/uapi/linux/dlm.h
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
--- a/include/uapi/linux/ethtool_netlink.h
+++ b/include/uapi/linux/ethtool_netlink.h
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
--- a/include/uapi/linux/landlock.h
+++ b/include/uapi/linux/landlock.h
--- a/include/uapi/linux/lwtunnel.h
+++ b/include/uapi/linux/lwtunnel.h
--- a/include/uapi/linux/stat.h
+++ b/include/uapi/linux/stat.h