mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-02-22 18:14:27 -05:00
Sync the branches to resolve the conflict reported in the below link. Link: https://lore.kernel.org/r/20240906131502.7a7d1962@canb.auug.org.au Signed-off-by: Jani Nikula <jani.nikula@intel.com>