diff options
| author | Ingo Molnar <mingo@kernel.org> | 2026-04-02 15:03:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-04-02 15:04:09 +0200 |
| commit | 9853914c08e00d2ccbffbceaaada5ad7c6e4db4c (patch) | |
| tree | 2e01e853871112c32a9cc446479459f1ecb9948d /drivers/net/netdevsim | |
| parent | 265439eb88fda0bf77821e10aafed22cdd450f9d (diff) | |
| parent | e08d007f9d813616ce7093600bc4fdb9c9d81d89 (diff) | |
| download | lwn-9853914c08e00d2ccbffbceaaada5ad7c6e4db4c.tar.gz lwn-9853914c08e00d2ccbffbceaaada5ad7c6e4db4c.zip | |
Merge branch 'sched/urgent' into sched/core, to resolve conflicts
The following fix in sched/urgent:
e08d007f9d81 ("sched/debug: Fix avg_vruntime() usage")
is in conflict with this pending commit in sched/core:
4823725d9d1d ("sched/fair: Increase weight bits for avg_vruntime")
Both modify the same variable definition and initialization blocks,
resolve it by merging the two.
Conflicts:
kernel/sched/debug.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/netdevsim')
| -rw-r--r-- | drivers/net/netdevsim/netdev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index 5ec028a00c62..3645ebde049a 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -109,8 +109,11 @@ static int nsim_forward_skb(struct net_device *tx_dev, int ret; ret = __dev_forward_skb(rx_dev, skb); - if (ret) + if (ret) { + if (psp_ext) + __skb_ext_put(psp_ext); return ret; + } nsim_psp_handle_ext(skb, psp_ext); |