Merge 05264d65 ("ring-buffer: Avoid softlockup in ring_buffer_resize()") into android11-5.4-lts

Steps on the way to 5.4.258

Change-Id: I7a2c545794738eee776c7e629e6baf2d0c38f119
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>