Jakub Kicinski 51b35d4f9d Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Merge in late fixes to prepare for the 6.11 net-next PR.

Conflicts:
  93c3a96c30 ("net: pse-pd: Do not return EOPNOSUPP if config is null")
  4cddb0f15e ("net: ethtool: pse-pd: Fix possible null-deref")
  30d7b67277 ("net: ethtool: Add new power limit get and set features")
https://lore.kernel.org/20240715123204.623520bb@canb.auug.org.au/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2024-07-15 13:19:17 -07:00

..

ila

ila: block BH in ila_output()

2024-06-03 18:50:09 -07:00

netfilter

net: Rename mono_delivery_time to tstamp_type for scalabilty

2024-05-23 14:14:23 -07:00

addrconf_core.c

…

addrconf.c

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

2024-07-15 13:19:17 -07:00

addrlabel.c

ipv6: remove RTNL protection from ip6addrlbl_dump()

2024-04-08 11:01:05 +01:00

af_inet6.c

Merge tag 'ipsec-next-2024-07-13' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2024-07-14 07:56:32 -07:00

ah6.c

…

anycast.c

ipv6: anycast: use call_rcu_hurry() in aca_put()

2024-05-01 11:46:21 +01:00

calipso.c

…

datagram.c

…

esp6_offload.c

xfrm: Log input direction mismatch error in one place

2024-06-17 13:53:19 +02:00

esp6.c

net: esp: cleanup esp_output_tail_tcp() in case of unsupported ESPINTCP

2024-05-23 08:46:03 +02:00

exthdrs_core.c

…

exthdrs_offload.c

…

exthdrs.c

net: ipv6: exthdrs: get rid of ipv6_skb_net()

2024-03-11 15:15:08 -07:00

fib6_notifier.c

…

fib6_rules.c

ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()

2024-05-08 18:50:53 -07:00

fou6.c

…

icmp.c

net: ipv{6,4}: Remove the now superfluous sentinel elements from ctl_table array

2024-05-03 13:29:42 +01:00

inet6_connection_sock.c

…

inet6_hashtables.c

tcp: get rid of twsk_unique()

2024-05-09 20:25:55 -07:00

ioam6_iptunnel.c

ipv6: ioam: block BH from ioam6_output()

2024-06-03 18:50:08 -07:00

ioam6.c

ipv6/addrconf: annotate data-races around devconf fields (II)

2024-03-01 08:42:33 +00:00

ip6_checksum.c

…

ip6_fib.c

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

2024-06-20 13:49:59 -07:00

ip6_flowlabel.c

…

ip6_gre.c

net: ip6_gre: Remove generic .ndo_get_stats64

2024-04-15 11:32:13 +01:00

ip6_icmp.c

…

ip6_input.c

ipv6/addrconf: annotate data-races around devconf fields (II)

2024-03-01 08:42:33 +00:00

ip6_offload.c

net: gro: initialize network_offset in network layer

2024-05-27 16:46:59 -07:00

ip6_offload.h

…

ip6_output.c

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

2024-07-15 13:19:17 -07:00

ip6_tunnel.c

net: annotate writes on dev->mtu from ndo_change_mtu()

2024-05-07 16:19:14 -07:00

ip6_udp_tunnel.c

…

ip6_vti.c

net: annotate writes on dev->mtu from ndo_change_mtu()

2024-05-07 16:19:14 -07:00

ip6mr.c

ipv6: introduce dst_rt6_info() helper

2024-04-29 13:32:01 +01:00

ipcomp6.c

…

ipv6_sockglue.c

net: use unrcu_pointer() helper

2024-06-06 11:52:52 +02:00

Kconfig

…

Makefile

…

mcast_snoop.c

…

mcast.c

ipv6/addrconf: annotate data-races around devconf fields (II)

2024-03-01 08:42:33 +00:00

mip6.c

…

ndisc.c

net/ipv6/ndisc: constify ctl_table arguments of utility function

2024-05-28 19:49:47 -07:00

netfilter.c

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

2024-06-13 13:13:46 -07:00

output_core.c

…

ping.c

ipv6: introduce dst_rt6_info() helper

2024-04-29 13:32:01 +01:00

proc.c

…

protocol.c

…

raw.c

net: raw: use sk_skb_reason_drop to free rx packets

2024-06-19 12:44:22 +01:00

reassembly.c

net: Rename mono_delivery_time to tstamp_type for scalabilty

2024-05-23 14:14:23 -07:00

route.c

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

2024-07-15 13:19:17 -07:00

rpl_iptunnel.c

net: ipv6: rpl_iptunnel: block BH in rpl_output() and rpl_input()

2024-06-03 18:50:08 -07:00

rpl.c

…

seg6_hmac.c

ipv6: sr: fix memleak in seg6_hmac_init_algo

2024-05-21 13:16:25 +02:00

seg6_iptunnel.c

ipv6: sr: block BH in seg6_output_core() and seg6_input_core()

2024-06-03 18:50:08 -07:00

seg6_local.c

seg6: Use nested-BH locking for seg6_bpf_srh_states.

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

seg6.c

ipv6: sr: restruct ifdefines

2024-05-30 18:29:38 -07:00

sit.c

ip_tunnel: convert __be16 tunnel flags to bitmaps

2024-04-01 10:49:28 +01:00

syncookies.c

tcp: use sk_skb_reason_drop to free rx packets

2024-06-19 12:44:22 +01:00

sysctl_net_ipv6.c

net: ipv{6,4}: Remove the now superfluous sentinel elements from ctl_table array

2024-05-03 13:29:42 +01:00

tcp_ao.c

…

tcp_ipv6.c

tcp: use sk_skb_reason_drop to free rx packets

2024-06-19 12:44:22 +01:00

tcpv6_offload.c

net: gro: use cb instead of skb->network_header

2024-05-13 14:44:06 -07:00

tunnel6.c

…

udp_impl.h

…

udp_offload.c

net: gro: fix udp bad offset in socket lookup by adding {inner_}network_offset to napi_gro_cb

2024-05-02 11:02:48 +02:00

udp.c

udp: Remove duplicate included header file trace/events/udp.h

2024-07-09 13:30:25 +02:00

udplite.c

…

xfrm6_input.c

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

2024-05-09 10:01:01 -07:00

xfrm6_output.c

…

xfrm6_policy.c

Merge tag 'ipsec-next-2024-07-13' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2024-07-14 07:56:32 -07:00

xfrm6_protocol.c

…

xfrm6_state.c

…

xfrm6_tunnel.c

Merge tag 'ipsec-next-2024-03-06' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2024-03-08 10:56:05 +00:00