On Tue, Oct 1, 2024 at 4:02 PM <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > > The patch below does not apply to the 6.1-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-6.1.y > git checkout FETCH_HEAD > git cherry-pick -x 8c2bd38b95f75f3d2a08c93e35303e26d480d24e > # <resolve conflicts, build, test, etc.> > git commit -s > git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024100127-uninsured-onyx-f79a@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. > > Possible dependencies: > > 8c2bd38b95f7 ("icmp: change the order of rate limits") > d0941130c935 ("icmp: Add counters for rate limits") > 8032bf1233a7 ("treewide: use get_random_u32_below() instead of deprecated function") > > thanks, Hi Greg, I did the backport of two patches : d0941130c935 ("icmp: Add counters for rate limits") clean cherry-pick 8c2bd38b95f7 ("icmp: change the order of rate limits") minor conflict. Thanks !
