merge v5.13.5

@guido.gunther this came in as part of the upstream stable patches: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.13.y&id=925a6b206bde1df6f7bba951b0d006c921c36c8f Can you take a look at how I resolved the conflicts with our tree? Other than it works for me, I can't jugde well what can go in which callback in the nwl bridge. (bits from the "fixup" callback moved to the "atmic_check" callback)