diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2026-06-01 14:35:51 +0300 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2026-06-01 14:42:12 +0300 |
| commit | c2c0486c56800ce276e79c40a6e576ffd672f2a9 (patch) | |
| tree | 772e6e01d5c2b8ed08f705533e35eed3efcd2676 /include/linux/timerqueue.h | |
| parent | 8415598365503ced2e3d019491b0a2756c85c494 (diff) | |
| parent | f3be0c984ecbcb82b0bec408022c4ef738cb3843 (diff) | |
| download | linux-c2c0486c56800ce276e79c40a6e576ffd672f2a9.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/ethernet/microsoft/mana/mana_en.c:
17bfe0a8c014e ("net: mana: Add NULL guards in teardown path to prevent panic on attach failure")
d07efe5a6e641 ("net: mana: Use per-queue allocation for tx_qp to reduce allocation size")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions