iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net
History
Jakub Kicinski e5abd12f3d Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  f7ce5eb2cb79 ("bnxt_en: Fix crash in bnxt_get_max_rss_ctx_ring()")
  20c8ad72eb7f ("eth: bnxt: use the RSS context XArray instead of the local list")

Adjacent changes:

net/ethtool/ioctl.c
  503757c80928 ("net: ethtool: Fix RSS setting")
  eac9122f0c41 ("net: ethtool: record custom RSS contexts in the XArray")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2024-07-12 22:20:30 -07:00
..
6lowpan
…
9p
Two fixes headed to stable trees:
2024-05-29 09:25:15 -07:00
802
…
8021q
net: annotate writes on dev->mtu from ndo_change_mtu()
2024-05-07 16:19:14 -07:00
appletalk
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-05-09 10:01:01 -07:00
atm
atm: clean up a put_user() calls
2024-06-14 19:08:50 -07:00
ax25
ax25: Replace kfree() in ax25_dev_free() with ax25_dev_put()
2024-06-01 15:49:42 -07:00
batman-adv
Revert "batman-adv: prefer kfree_rcu() over call_rcu() with free-only callbacks"
2024-06-12 20:18:00 +02:00
bluetooth
Bluetooth: L2CAP: Fix deadlock
2024-06-28 14:32:02 -04:00
bpf
bpf-next-for-netdev
2024-07-09 17:01:46 +02:00
bridge
netfilter: br_netfilter: Use nested-BH locking for brnf_frag_data_storage.
2024-06-24 16:41:23 -07:00
caif
net: caif: remove unused structs
2024-06-05 10:18:06 +01:00
can
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-06-27 12:14:11 -07:00
ceph
libceph: fix crush_choose_firstn() kernel-doc warnings
2024-07-11 16:33:07 +02:00
core
netdevice: define and allocate &net_device _properly_
2024-07-11 18:11:31 -07:00
dcb
…
dccp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-06-27 12:14:11 -07:00
devlink
devlink: Constify the 'table_ops' parameter of devl_dpipe_table_register()
2024-06-05 10:24:57 +01:00
dns_resolver
…
dsa
net: dsa: Fix typo in NET_DSA_TAG_RTL4_A Kconfig
2024-06-11 19:24:11 -07:00
ethernet
netkit: Fix pkt_type override upon netkit pass verdict
2024-05-25 10:48:57 -07:00
ethtool
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-07-12 22:20:30 -07:00
handshake
net/handshake: remove redundant assignment to variable ret
2024-04-16 17:14:55 -07:00
hsr
net: hsr: cosmetic: Remove extra white space
2024-06-19 17:32:57 -07:00
ieee802154
bpf-next-for-netdev
2024-05-28 07:27:29 -07:00
ife
…
ipv4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-07-11 12:58:13 -07:00
ipv6
udp: Remove duplicate included header file trace/events/udp.h
2024-07-09 13:30:25 +02:00
iucv
more s390 updates for 6.10 merge window
2024-05-21 12:09:36 -07:00
kcm
…
key
…
l2tp
l2tp: fix l2tp_session_register with colliding l2tpv3 IDs
2024-07-12 04:09:18 +01:00
l3mdev
…
lapb
…
llc
net: change proto and proto_ops accept type
2024-05-13 18:19:09 -06:00
mac80211
wifi: mac80211: fix AP chandef capturing in CSA
2024-07-10 12:35:58 +02:00
mac802154
net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()
2024-06-03 11:20:56 +02:00
mctp
…
mpls
net: Remove the now superfluous sentinel elements from ctl_table array
2024-05-03 13:29:41 +01:00
mptcp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-06-13 13:13:46 -07:00
ncsi
net/ncsi: Fix the multi thread manner of NCSI driver
2024-06-01 16:21:44 -07:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-07-11 12:58:13 -07:00
netlabel
netlabel: fix RCU annotation for IPv4 options on socket creation
2024-05-13 14:58:12 -07:00
netlink
net: netlink: remove the cb_mutex "injection" from netlink core
2024-06-10 13:15:40 +01:00
netrom
netrom: Fix a memory leak in nr_heartbeat_expiry()
2024-06-17 13:06:23 +01:00
nfc
Quite smaller than usual. Notably it includes the fix for the unix
2024-05-23 12:49:37 -07:00
nsh
nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
2024-04-26 12:20:01 +02:00
openvswitch
net: openvswitch: store sampling probability in cb.
2024-07-05 17:45:47 -07:00
packet
af_packet: use sk_skb_reason_drop to free rx packets
2024-06-19 12:44:22 +01:00
phonet
net: change proto and proto_ops accept type
2024-05-13 18:19:09 -06:00
psample
net: psample: fix flag being set in wrong skb
2024-07-11 18:11:31 -07:00
qrtr
net: qrtr: ns: Ignore ENODEV failures in ns
2024-06-14 13:17:21 +02:00
rds
rds:Simplify the allocation of slab caches
2024-06-19 10:47:40 +01:00
rfkill
net: rfkill: Correct return value in invalid parameter case
2024-06-26 10:49:01 +02:00
rose
net: change proto and proto_ops accept type
2024-05-13 18:19:09 -06:00
rxrpc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-05-09 10:01:01 -07:00
sched
net/sched: act_skbmod: convert comma to semicolon
2024-07-11 17:12:15 -07:00
sctp
sctp: cancel a blocking accept when shutdown a listen socket
2024-07-03 09:45:39 +01:00
smc
net/smc: Introduce IPPROTO_SMC
2024-06-17 13:14:09 +01:00
strparser
…
sunrpc
net, sunrpc: Remap EPERM in case of connection failure in xs_tcp_setup_socket
2024-07-11 12:17:45 +02:00
switchdev
net: bridge: switchdev: Improve error message for port_obj_add/del functions
2024-05-08 12:19:12 +01:00
tipc
tipc: Consolidate redundant functions
2024-07-12 03:47:43 +01:00
tls
net: tls: Pass union tls_crypto_context pointer to memzero_explicit
2024-07-09 11:14:47 -07:00
unix
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2024-07-04 14:16:11 -07:00
vmw_vsock
virtio: features, fixes, cleanups
2024-05-23 12:04:36 -07:00
wireless
wifi: cfg80211: add helper for checking if a chandef is valid on a radio
2024-07-09 11:36:00 +02:00
x25
net: change proto and proto_ops accept type
2024-05-13 18:19:09 -06:00
xdp
net: Move flush list retrieval to where it is used.
2024-07-02 15:26:57 +02:00
xfrm
net: fix __dst_negative_advice() race
2024-05-29 17:34:49 -07:00
compat.c
…
devres.c
…
Kconfig
ethtool: provide customized dim profile management
2024-06-25 17:15:06 -07:00
Kconfig.debug
…
Makefile
…
socket.c
net: have do_accept() take a struct proto_accept_arg argument
2024-05-13 18:19:19 -06:00
sysctl_net.c
sysctl: treewide: constify argument ctl_table_root::permissions(table)
2024-04-24 09:43:54 +02:00