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

..

caif

tty: cumulate and document tty_struct::flow* members

2021-05-13 16:57:16 +02:00

device_drivers

net/mlx5e: SHAMPO, Add no-split ethtool counters for header/data split

2024-09-12 20:50:30 -07:00

devlink

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue

2024-07-13 16:04:52 -07:00

diagnostic

Documentation: networking: add Twisted Pair Ethernet diagnostics at OSI Layer 1

2024-10-08 11:45:35 +02:00

dsa

net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT

2023-10-24 13:08:14 -07:00

mac80211_hwsim

…

net_cachelines

Merge net-next/main to resolve conflicts

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

netlink_spec

Documentation: Document each netlink family

2023-11-24 01:16:56 +00:00

pse-pd

net: pse-pd: Add support for PSE PIs

2024-04-18 18:27:33 -07:00

6lowpan.rst

…

6pack.rst

…

af_xdp.rst

Revert "xsk: Document ability to redirect to any socket bound to the same umem"

2024-06-05 09:43:05 +02:00

alias.rst

…

arcnet-hardware.rst

Documentation: networking: correct spelling

2023-01-31 13:00:47 +01:00

arcnet.rst

…

atm.rst

…

ax25.rst

Documentation: netdev: fix dead link in ax25.rst

2023-09-18 12:56:58 +01:00

bareudp.rst

…

batman-adv.rst

batman-adv: Fix mailing list address

2023-01-21 19:01:59 +01:00

bonding.rst

bonding: Add independent control state machine

2024-02-06 13:17:54 +01:00

bridge.rst

Documentation: update mailing list addresses

2024-02-21 13:44:21 -07:00

can_ucan_protocol.rst

Documentation: networking: correct spelling

2023-01-31 13:00:47 +01:00

can.rst

can: bcm: add recvmsg flags for own, local and remote traffic

2024-02-12 16:55:17 +01:00

cdc_mbim.rst

Documentation: networking: correct spelling

2023-01-31 13:00:47 +01:00

checksum-offloads.rst

…

dccp.rst

…

dctcp.rst

…

devmem.rst

net: add devmem TCP documentation

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

dns_resolver.rst

dns_resolver: correct module name in dns resolver documentation

2024-03-26 10:15:36 +01:00

driver.rst

net: docs: update the sample code in driver.rst

2023-04-13 13:30:21 +02:00

eql.rst

…

ethtool-netlink.rst

Documentation: networking: Fix missing PSE documentation and grammar issues

2024-09-13 19:59:53 -07:00

failover.rst

…

fib_trie.rst

…

filter.rst

ARC: Add eBPF JIT support

2024-05-12 16:51:36 -07:00

gen_stats.rst

…

generic_netlink.rst

Documentation: networking: Update generic_netlink_howto URL

2022-11-23 17:25:02 -08:00

generic-hdlc.rst

…

gtp.rst

Documentation: networking: correct spelling

2023-01-31 13:00:47 +01:00

ieee802154.rst

Documentation: networking: correct spelling

2023-01-31 13:00:47 +01:00

ila.rst

…

index.rst

Documentation: networking: add Twisted Pair Ethernet diagnostics at OSI Layer 1

2024-10-08 11:45:35 +02:00

ioam6-sysctl.rst

ipv6: ioam: Documentation for new IOAM sysctls

2021-07-21 08:14:33 -07:00

ip_dynaddr.rst

…

ip-sysctl.rst

Add support for PIO p flag

2024-07-31 13:49:48 +01:00

ipsec.rst

…

ipv6.rst

…

ipvlan.rst

Documentation: networking: correct spelling

2023-01-31 13:00:47 +01:00

ipvs-sysctl.rst

ipvs: run_estimation should control the kthread tasks

2022-12-10 22:44:43 +01:00

iso15765-2.rst

Documentation: networking: document ISO 15765-2

2024-06-20 11:56:22 +02:00

j1939.rst

Documentation: networking: correct spelling

2023-01-31 13:00:47 +01:00

kapi.rst

…

kcm.rst

…

l2tp.rst

documentation/networking: update l2tp docs

2024-08-11 04:38:49 +01:00

lapb-module.rst

…

mac80211-auth-assoc-deauth.txt

…

mac80211-injection.rst

…

mctp.rst

mctp: Add SIOCMCTP{ALLOC,DROP}TAG ioctls for tag control

2022-02-09 12:00:11 +00:00

mpls-sysctl.rst

…

mptcp-sysctl.rst

mptcp: disable active MPTCP in case of blackhole

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

mptcp.rst

doc: new 'mptcp' page in 'networking'

2024-06-01 15:18:01 -07:00

msg_zerocopy.rst

docs: net: description of MSG_ZEROCOPY for AF_VSOCK

2023-10-15 13:19:42 +01:00

multi-pf-netdev.rst

docs: networking: Align documentation with behavior change

2024-08-16 14:29:44 -07:00

multiqueue.rst

…

napi.rst

doc: net: napi: Update documentation for napi_schedule_irqoff

2024-10-03 12:07:29 +02:00

net_dim.rst

ethtool: provide customized dim profile management

2024-06-25 17:15:06 -07:00

net_failover.rst

Documentation: networking: correct spelling

2023-01-31 13:00:47 +01:00

netconsole.rst

net: netconsole: Add continuation line prefix to userdata messages

2024-03-11 14:07:57 -07:00

netdev-features.rst

netdev_features: convert NETIF_F_NETNS_LOCAL to dev->netns_local

2024-09-03 11:36:43 +02:00

netdevices.rst

netdev_features: convert NETIF_F_LLTX to dev->lltx

2024-09-03 11:36:43 +02:00

netfilter-sysctl.rst

…

netif-msg.rst

…

nexthop-group-resilient.rst

Documentation: net: Document resilient next-hop groups

2021-03-29 13:51:38 -07:00

nf_conntrack-sysctl.rst

netfilter: conntrack: documentation: remove reference to non-existent sysctl

2024-05-06 16:29:21 +02:00

nf_flowtable.rst

docs: nf_flowtable: fix compilation and warnings

2021-03-25 17:42:02 -07:00

nfc.rst

…

oa-tc6-framework.rst

Documentation: networking: add OPEN Alliance 10BASE-T1x MAC-PHY serial interface

2024-09-11 20:53:42 -07:00

openvswitch.rst

…

operstates.rst

docs: operstates: document IF_OPER_TESTING

2021-08-02 15:16:04 +01:00

packet_mmap.rst

mm, treewide: rename MAX_ORDER to MAX_PAGE_ORDER

2024-01-08 15:27:15 -08:00

page_pool.rst

net: page_pool: expose page pool stats via netlink

2023-11-28 15:48:39 +01:00

phonet.rst

Documentation: networking: correct spelling

2023-01-31 13:00:47 +01:00

phy-link-topology.rst

Documentation: networking: document phy_link_topology

2024-08-23 13:04:35 +01:00

phy.rst

net: phy: introduce core support for phy-mode = "10g-qxgmii"

2024-06-18 13:28:26 +02:00

pktgen.rst

pktgen: Introducing 'SHARED' flag for testing with non-shared skb

2023-09-28 16:25:14 +02:00

plip.rst

…

ppp_generic.rst

…

proc_net_tcp.rst

…

radiotap-headers.rst

…

rds.rst

Doc: networking: Fix the title's Sphinx overline in rds.rst

2021-11-29 15:18:21 -07:00

regulatory.rst

Documentation: networking: correct spelling

2023-01-31 13:00:47 +01:00

representors.rst

Documentation: Add documentation for eswitch attribute

2024-03-28 18:20:08 -07:00

rxrpc.rst

rxrpc: Fix potential race in error handling in afs_make_call()

2023-04-22 15:16:39 +01:00

scaling.rst

net: ethtool: add support for symmetric-xor RSS hash

2023-12-13 22:07:16 -08:00

sctp.rst

…

secid.rst

…

seg6-sysctl.rst

doc: move seg6_flowlabel to seg6-sysctl.rst

2021-04-14 13:13:15 -07:00

segmentation-offloads.rst

…

sfp-phylink.rst

doc: sfp-phylink: update the porting guide with PCS handling

2024-03-07 15:27:05 +01:00

skbuff.rst

skbuff: render the checksum comment to documentation

2022-05-10 17:48:37 -07:00

smc-sysctl.rst

net/smc: add sysctl for max conns per lgr for SMC-R v2.1

2023-11-24 12:13:14 +00:00

snmp_counter.rst

docs: automarkup: linkify git revs

2023-11-17 13:13:24 -07:00

sriov.rst

docs: net: document guidance of implementing the SR-IOV NDOs

2024-06-21 10:18:45 +01:00

statistics.rst

netdev: add per-queue statistics

2024-03-07 21:13:25 -08:00

strparser.rst

…

switchdev.rst

netdev_features: convert NETIF_F_NETNS_LOCAL to dev->netns_local

2024-09-03 11:36:43 +02:00

sysfs-tagging.rst

Documentation: networking: correct spelling

2023-01-31 13:00:47 +01:00

tc-actions-env-rules.rst

…

tc-queue-filters.rst

Documentation: networking: TC queue based filtering

2022-10-25 10:32:40 +02:00

tcp_ao.rst

Documentation/tcp-ao: Add a few lines on tracepoints

2024-06-12 06:39:04 +01:00

tcp-thin.rst

…

team.rst

…

timestamping.rst

net_tstamp: add SCM_TS_OPT_ID to provide OPT_ID in control message

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

tipc.rst

Documentation: add more details in tipc.rst

2021-07-01 13:18:18 -07:00

tls-handshake.rst

net/handshake: Enable the SNI extension to work properly

2023-05-24 22:05:24 -07:00

tls-offload-layers.svg

…

tls-offload-reorder-bad.svg

…

tls-offload-reorder-good.svg

…

tls-offload.rst

net: Disable NETIF_F_HW_TLS_RX when RXCSUM is disabled

2021-01-19 15:58:05 -08:00

tls.rst

tls: rx: add counter for NoPad violations

2022-07-11 19:48:33 -07:00

tproxy.rst

docs: tproxy: ignore non-transparent sockets in iptables

2024-09-26 13:03:01 +02:00

tuntap.rst

docs: networking: Replace strncpy() with strscpy()

2021-06-04 11:21:43 -06:00

udplite.rst

…

vrf.rst

doc: Document unexpected tcp_l3mdev_accept=1 behavior

2021-08-23 11:53:24 +01:00

vxlan.rst

…

x25-iface.rst

docs: networking: fix x25-iface.rst heading & index order

2023-05-10 10:31:46 +01:00

x25.rst

…

xdp-rx-metadata.rst

xdp: Add VLAN tag hint

2023-12-13 16:16:40 -08:00

xfrm_device.rst

xfrm: generalize xdo_dev_state_update_curlft to allow statistics update

2024-02-05 16:45:49 -08:00

xfrm_proc.rst

xfrm: Add dir validation to "in" data path lookup

2024-05-01 10:06:27 +02:00

xfrm_sync.rst

…

xfrm_sysctl.rst

…

xsk-tx-metadata.rst

xsk: Require XDP_UMEM_TX_METADATA_LEN to actuate tx_metadata_len

2024-07-25 11:57:27 +02:00