mirror_ubuntu-kernels/drivers/net/dsa/qca
Jakub Kicinski 449f6bc17a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.

Conflicts:

net/sched/sch_taprio.c
  d636fc5dd6 ("net: sched: add rcu annotations around qdisc->qdisc_sleeping")
  dced11ef84 ("net/sched: taprio: don't overwrite "sch" variable in taprio_dump_class_stats()")

net/ipv4/sysctl_net_ipv4.c
  e209fee411 ("net/ipv4: ping_group_range: allow GID from 2147483648 to 4294967294")
  ccce324dab ("tcp: make the first N SYN RTO backoffs linear")
https://lore.kernel.org/all/20230605100816.08d41a7b@canb.auug.org.au/

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-06-08 11:35:14 -07:00
..
ar9331.c net: dsa: qca8k: remove unnecessary (void*) conversions 2023-06-07 12:26:19 +01:00
Kconfig net: dsa: qca8k: add CONFIG_LEDS_TRIGGERS dependency 2023-06-02 10:55:41 +01:00
Makefile net: dsa: qca8k: add LEDs basic support 2023-04-19 12:59:15 +01:00
qca8k_leds.h net: dsa: qca8k: add LEDs basic support 2023-04-19 12:59:15 +01:00
qca8k-8xxx.c net: dsa: qca8k: remove unnecessary (void*) conversions 2023-06-07 12:26:19 +01:00
qca8k-common.c net: dsa: qca8k: remove unnecessary (void*) conversions 2023-06-07 12:26:19 +01:00
qca8k-leds.c net: dsa: qca8k: add op to get ports netdev 2023-05-31 09:42:09 +01:00
qca8k.h net: dsa: qca8k: add LEDs basic support 2023-04-19 12:59:15 +01:00