diff options
| author | Ingo Molnar <mingo@kernel.org> | 2022-02-21 13:53:51 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-02-21 13:53:51 +0300 |
| commit | 6255b48aebfd4dff375e97fc8b075a235848db0b (patch) | |
| tree | bcedf2b959a843a18cf7ebcc9120a0dd1c4e234f /drivers/net/ethernet/microchip/sparx5/sparx5_port.h | |
| parent | 1b2d3451ee50a0968cb9933f726e50b368ba5073 (diff) | |
| parent | cfb92440ee71adcc2105b0890bb01ac3cddb8507 (diff) | |
| download | linux-6255b48aebfd4dff375e97fc8b075a235848db0b.tar.xz | |
Merge tag 'v5.17-rc5' into sched/core, to resolve conflicts
New conflicts in sched/core due to the following upstream fixes:
44585f7bc0cb ("psi: fix "defined but not used" warnings when CONFIG_PROC_FS=n")
a06247c6804f ("psi: Fix uaf issue when psi trigger is destroyed while being polled")
Conflicts:
include/linux/psi_types.h
kernel/sched/psi.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/microchip/sparx5/sparx5_port.h')
0 files changed, 0 insertions, 0 deletions