mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-22 15:07:32 -04:00
6a4c4656b0
Cross-merge networking fixes after downstream PR (net-7.1-rc3). Conflicts: net/ipv4/igmp.c726fa7da2d("ipv4: igmp: get rid of IGMPV3_{QQIC,MRC} and simplify calculation")c6bebaa744("ipv4: igmp: annotate data-races in igmp_heard_query()") https://lore.kernel.org/a7365e4873340f7a5e30411207de3bf9@kernel.org Adjacent changes: net/psp/psp_main.c30cb24f97d("psp: strip variable-length PSP header in psp_dev_rcv()")c2b22277ad("psp: validate IPv4 header fields in psp_dev_rcv()") net/sched/sch_fq_codel.cf83e07b292("net/sched: sch_fq_codel: annotate data-races from fq_codel_dump_class_stats()")3f3aa77ff1("net/sched: add qstats_cpu_drop_inc() helper") net/wireless/pmsr.c0f3c0a1973("wifi: nl80211: fix NL80211_PMSR_FTM_REQ_ATTR_FTMS_PER_BURST usage")410aa47fd9("wifi: cfg80211: allow suppressing FTM result reporting for PD requests") Signed-off-by: Jakub Kicinski <kuba@kernel.org>