The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 6ebbe97a488179f5dc85f2f1e0c89b486e99ee97 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024073013-reenact-citizen-9225@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 6ebbe97a4881 ("ice: Add a per-VF limit on number of FDIR filters") 83c911dc5e0e ("ice: Reset FDIR counter in FDIR init stage") 29486b6df3e6 ("ice: add profile conflict check for AVF FDIR") 5e24d5984c80 ("ice: Use int for ice_status") 247dd97d713c ("ice: Refactor status flow for DDP load") fabf480bf95d ("ice: Refactor promiscuous functions") 8818b95409d8 ("ice: Add package PTYPE enable information") ce572a5b88d5 ("ice: Fix replacing VF hardware MAC to existing MAC filter") 1a8c7778bcde ("ice: Fix VF true promiscuous mode") bdfa75ad70e9 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
