On Mon, Jun 19, 2023 at 09:23:01AM -0300, Pedro Tammela wrote: > On 19/06/2023 03:52, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > > This is a note to let you know that I've just added the patch titled > > > > net/sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy > > > > to the 6.1-stable tree which can be found at: > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > > > The filename of the patch is: > > net-sched-act_api-move-tca_ext_warn_msg-to-the-correct-hierarchy.patch > > and it can be found in the queue-6.1 subdirectory. > > > > If you, or anyone else, feels it should not be added to the stable tree, > > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > > > > From 923b2e30dc9cd05931da0f64e2e23d040865c035 Mon Sep 17 00:00:00 2001 > > From: Pedro Tammela <pctammela@xxxxxxxxxxxx> > > Date: Fri, 24 Feb 2023 14:56:01 -0300 > > Subject: net/sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy > > > > From: Pedro Tammela <pctammela@xxxxxxxxxxxx> > > > > commit 923b2e30dc9cd05931da0f64e2e23d040865c035 upstream. > > > > TCA_EXT_WARN_MSG is currently sitting outside of the expected hierarchy > > for the tc actions code. It should sit within TCA_ACT_TAB. > > > > Fixes: 0349b8779cc9 ("sched: add new attr TCA_EXT_WARN_MSG to report tc extact message") > > Reviewed-by: Jamal Hadi Salim <jhs@xxxxxxxxxxxx> > > Signed-off-by: Pedro Tammela <pctammela@xxxxxxxxxxxx> > > Reviewed-by: Simon Horman <simon.horman@xxxxxxxxxxxx> > > Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> > > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > --- > > net/sched/act_api.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > --- a/net/sched/act_api.c > > +++ b/net/sched/act_api.c > > @@ -1603,12 +1603,12 @@ static int tca_get_fill(struct sk_buff * > > if (tcf_action_dump(skb, actions, bind, ref, false) < 0) > > goto out_nlmsg_trim; > > - nla_nest_end(skb, nest); > > - > > if (extack && extack->_msg && > > nla_put_string(skb, TCA_EXT_WARN_MSG, extack->_msg)) > > goto out_nlmsg_trim; > > + nla_nest_end(skb, nest); > > + > > nlh->nlmsg_len = skb_tail_pointer(skb) - b; > > return skb->len; > > > > Hi! > This commit is bogus. The correct one to pull is: > 2f59823fe696 ("net/sched: act_api: add specific EXT_WARN_MSG for tc action") > If it's already in the queue then just removing this one is enough. It is in the queue, AND I grabbed the revert of this original one, to preserve the history properly and ensure we don't try to apply it again. thanks, greg k-h
