Johannes Berg a0efa2f362 Merge net-next/main to resolve conflicts ...

The wireless-next tree was based on something older, and there
are now conflicts between -rc2 and work here. Merge net-next,
which has enough of -rc2 for the conflicts to happen, resolving
them in the process.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2024-10-09 08:59:22 +02:00

..

9p

…

bluetooth

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

caif

caif: Remove unused cfsrvl_getphyid

2024-10-08 15:33:49 -07:00

iucv

s390/iucv: Correct spelling in iucv.h

2024-08-26 09:37:22 -07:00

libeth

libeth: add Tx buffer completion helpers

2024-09-09 13:15:37 -07:00

mana

net: mana: Increase the DEF_RX_BUFFERS_PER_QUEUE to 1024

2024-10-03 11:37:24 +02:00

netfilter

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

netns

net-timestamp: namespacify the sysctl_tstamp_allow_data

2024-10-08 15:33:11 -07:00

nfc

NFC: Correct spelling in headers

2024-08-26 09:37:23 -07:00

page_pool

memory-provider: dmabuf devmem memory provider

2024-09-11 20:44:31 -07:00

phonet

…

sctp

sctp: Correct spelling in headers

2024-08-26 09:37:23 -07:00

tc_act

…

6lowpan.h

…

act_api.h

…

addrconf.h

net: Correct spelling in headers

2024-08-26 09:37:23 -07:00

af_ieee802154.h

…

af_rxrpc.h

…

af_unix.h

af_unix: Remove U_LOCK_GC_LISTENER.

2024-06-25 11:10:18 +02:00

af_vsock.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-08-15 17:18:52 -07:00

ah.h

…

amt.h

…

arp.h

…

atmclip.h

…

ax25.h

…

ax88796.h

…

bareudp.h

…

bond_3ad.h

bonding: Correct spelling in headers

2024-08-26 09:37:22 -07:00

bond_alb.h

bonding: Correct spelling in headers

2024-08-26 09:37:22 -07:00

bond_options.h

…

bonding.h

bonding: change ipsec_lock from spin lock to mutex

2024-08-27 13:11:37 -07:00

bpf_sk_storage.h

…

busy_poll.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2024-08-29 11:49:10 -07:00

calipso.h

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

cfg80211-wext.h

…

cfg80211.h

wifi: cfg80211: fix kernel-doc for per-link data

2024-09-09 11:04:25 +02:00

cfg802154.h

…

checksum.h

…

cipso_ipv4.h

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

cls_cgroup.h

…

codel_impl.h

…

codel_qdisc.h

…

codel.h

…

compat.h

…

datalink.h

…

dcbevent.h

…

dcbnl.h

…

devlink.h

…

dropreason-core.h

net: Correct spelling in headers

2024-08-26 09:37:23 -07:00

dropreason.h

…

dsa_stubs.h

…

dsa.h

net: dsa: remove obsolete phylink dsa_switch operations

2024-10-07 16:23:10 -07:00

dscp.h

…

dsfield.h

…

dst_cache.h

net: Correct spelling in headers

2024-08-26 09:37:23 -07:00

dst_metadata.h

net: Silence false field-spanning write warning in metadata_dst memcpy

2024-08-20 15:22:17 -07:00

dst_ops.h

…

dst.h

net: Correct spelling in headers

2024-08-26 09:37:23 -07:00

eee.h

…

erspan.h

net: Correct spelling in headers

2024-08-26 09:37:23 -07:00

esp.h

…

espintcp.h

…

ethoc.h

…

failover.h

…

fib_notifier.h

…

fib_rules.h

…

firewire.h

…

flow_dissector.h

flow_dissector: cleanup FLOW_DISSECTOR_KEY_ENC_FLAGS

2024-07-15 09:14:39 -07:00

flow_offload.h

…

flow.h

…

fou.h

…

fq_impl.h

…

fq.h

…

garp.h

…

gen_stats.h

…

genetlink.h

…

geneve.h

…

gre.h

…

gro_cells.h

…

gro.h

…

gso.h

…

gtp.h

…

gue.h

…

handshake.h

…

hotdata.h

…

hwbm.h

net: Correct spelling in headers

2024-08-26 09:37:23 -07:00

icmp.h

…

ieee8021q.h

…

ieee80211_radiotap.h

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

ieee802154_netdev.h

…

if_inet6.h

…

ife.h

…

inet6_connection_sock.h

…

inet6_hashtables.h

inet6: constify 'struct net' parameter of various lookup helpers

2024-08-05 16:27:26 -07:00

inet_common.h

…

inet_connection_sock.h

tcp: add a fast path in tcp_delack_timer()

2024-10-04 15:34:40 -07:00

inet_dscp.h

…

inet_ecn.h

…

inet_frag.h

…

inet_hashtables.h

inet: constify 'struct net' parameter of various lookup helpers

2024-08-05 16:22:45 -07:00

inet_sock.h

net_tstamp: add SCM_TS_OPT_ID to provide OPT_ID in control message

2024-10-04 11:52:19 -07:00

inet_timewait_sock.h

tcp: remove volatile qualifier on tw_substate

2024-08-28 17:08:16 -07:00

inetpeer.h

…

ioam6.h

…

ip6_checksum.h

…

ip6_fib.h

…

ip6_route.h

ipv6: fix source address selection with route leak

2024-07-14 07:34:16 -07:00

ip6_tunnel.h

…

ip_fib.h

ipv4: Fix user space build failure due to header change

2024-09-04 16:40:33 -07:00

ip_tunnels.h

ip_tunnel: Correct spelling in ip_tunnels.h

2024-08-26 09:37:22 -07:00

ip_vs.h

…

ip.h

ipv4: Convert ip_route_input() to dscp_t.

2024-10-03 16:21:21 -07:00

ipcomp.h

…

ipconfig.h

…

ipv6_frag.h

…

ipv6_stubs.h

ipv6: udp: constify 'struct net' parameter of socket lookups

2024-08-05 16:27:26 -07:00

ipv6.h

ipv6: Correct spelling in ipv6.h

2024-08-26 09:37:22 -07:00

iw_handler.h

Revert "wifi: cfg80211: unexport wireless_nlevent_flush()"

2024-10-09 08:53:01 +02:00

kcm.h

kcm: Serialise kcm_sendmsg() for the same socket.

2024-08-19 18:36:12 -07:00

l3mdev.h

…

lag.h

…

lapb.h

…

llc_c_ac.h

…

llc_c_ev.h

…

llc_c_st.h

llc: Constify struct llc_conn_state_trans

2024-07-15 08:51:01 -07:00

llc_conn.h

…

llc_if.h

…

llc_pdu.h

net: Correct spelling in headers

2024-08-26 09:37:23 -07:00

llc_s_ac.h

…

llc_s_ev.h

…

llc_s_st.h

llc: Constify struct llc_sap_state_trans

2024-07-15 08:51:19 -07:00

llc_sap.h

…

llc.h

…

lwtunnel.h

…

mac80211.h

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

mac802154.h

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

macsec.h

…

mctp.h

…

mctpdevice.h

…

mip6.h

…

mld.h

…

mpls_iptunnel.h

…

mpls.h

…

mptcp.h

mptcp: fallback to TCP after SYN+MPC drops

2024-09-11 15:57:50 -07:00

mrp.h

…

ncsi.h

…

ndisc.h

ipv6: eliminate ndisc_ops_is_useropt()

2024-08-12 17:23:57 -07:00

neighbour.h

sysctl: treewide: constify the ctl_table argument of proc_handlers

2024-07-24 20:59:29 +02:00

net_debug.h

…

net_failover.h

…

net_namespace.h

rtnetlink: Add per-netns RTNL.

2024-10-08 15:16:59 +02:00

net_ratelimit.h

…

net_trackers.h

…

netdev_queues.h

…

netdev_rx_queue.h

memory-provider: fix compilation issue without SYSFS

2024-09-12 21:00:26 -07:00

netevent.h

…

netkit.h

…

netlabel.h

netlabel: Correct spelling in netlabel.h

2024-08-26 09:37:22 -07:00

netlink.h

net: Correct spelling in headers

2024-08-26 09:37:23 -07:00

netmem.h

page_pool: devmem support

2024-09-11 20:44:31 -07:00

netprio_cgroup.h

…

netrom.h

…

nexthop.h

net: nexthop: Increase weight to u16

2024-08-12 17:50:34 -07:00

nl802154.h

ieee802154: Correct spelling in nl802154.h

2024-08-30 22:30:55 +02:00

nsh.h

…

p8022.h

…

pfcp.h

…

pie.h

…

ping.h

…

pkt_cls.h

net: sched: Correct spelling in headers

2024-08-26 09:37:23 -07:00

pkt_sched.h

…

pptp.h

…

proto_memory.h

…

protocol.h

…

psample.h

net: psample: fix flag being set in wrong skb

2024-07-11 18:11:31 -07:00

psnap.h

…

raw.h

…

rawv6.h

…

red.h

net: sched: Correct spelling in headers

2024-08-26 09:37:23 -07:00

regulatory.h

net: Correct spelling in headers

2024-08-26 09:37:23 -07:00

request_sock.h

…

rose.h

…

route.h

ipv4: Convert ip_route_input_noref() to dscp_t.

2024-10-03 16:21:21 -07:00

rpl.h

…

rps.h

…

rsi_91x.h

…

rstreason.h

tcp: rstreason: introduce SK_RST_REASON_TCP_DISCONNECT_WITH_DATA for active reset

2024-08-07 10:24:46 +01:00

rtnetlink.h

…

rtnh.h

…

sch_generic.h

…

scm.h

…

secure_seq.h

…

seg6_hmac.h

…

seg6_local.h

seg6: Use nested-BH locking for seg6_bpf_srh_states.

2024-06-24 16:41:23 -07:00

seg6.h

…

selftests.h

…

slhc_vj.h

…

smc.h

…

snmp.h

…

sock_reuseport.h

net: core: annotate socks of struct sock_reuseport with __counted_by

2024-08-02 17:16:59 -07:00

sock.h

net-timestamp: namespacify the sysctl_tstamp_allow_data

2024-10-08 15:33:11 -07:00

Space.h

…

stp.h

…

strparser.h

…

switchdev.h

…

tc_wrapper.h

…

tcp_ao.h

…

tcp_states.h

…

tcp.h

tcp: Fix spelling mistake "emtpy" -> "empty"

2024-10-01 12:06:07 +02:00

tcx.h

bpf: Fix too early release of tcx_entry

2024-07-08 14:07:31 -07:00

timewait_sock.h

…

tipc.h

…

tls_prot.h

…

tls_toe.h

…

tls.h

…

transp_v6.h

…

tso.h

…

tun_proto.h

…

udp_tunnel.h

…

udp.h

net: Correct spelling in headers

2024-08-26 09:37:23 -07:00

udplite.h

…

vsock_addr.h

…

vxlan.h

…

wext.h

…

x25.h

x25: Correct spelling in x25.h

2024-08-26 09:37:23 -07:00

x25device.h

…

xdp_priv.h

…

xdp_sock_drv.h

…

xdp_sock.h

net: Optimize xdp_do_flush() with bpf_net_context infos.

2024-07-02 15:26:57 +02:00

xdp.h

…

xfrm.h

xfrm: minor update to sdb and xfrm_policy comments

2024-08-28 07:37:13 +02:00

xsk_buff_pool.h

…