merge v5.13.5 (!426) · Merge requests · Librem5 / linux · GitLab

Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this wiki page for instructions on how to get full permissions. Sorry for the inconvenience.

Martin Kepplinger requested to merge martin.kepplinger/linux-next:stable/5.13.5 into next/byzantium Jul 27, 2021

@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)