Steps on the way to 5.16-rc3 Resolves conflicts in: drivers/hid/hid-nintendo.c due to the android tree sticking with the old version of this driver. Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I0a4f24f71ee4eb095a5b24a547de33931ecb3922