Merge branch 'android11-5.4' into 'android11-5.4-lts'

Sync up with android11-5.4 for the following commits:

bf4d02ab UPSTREAM: io_uring: Fix current->fs handling in io_sq_wq_submit_work()
5ce18d9a ANDROID: ABI: Update allowed list for QCOM

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